Commit 20f8a9c4 authored by Christophe Deschamps's avatar Christophe Deschamps
Browse files

Build 3 (crash fix)


Former-commit-id: d84a9f6f422e420f148263c8d63853d640d7ec68
parent ed73167c
This diff is collapsed.
......@@ -7,9 +7,9 @@ apply plugin: "androidx.navigation.safeargs"
apply plugin: 'com.google.firebase.crashlytics'
repositories {
maven {
url file(LinphoneSdkBuildDir + '/maven_repository/')
}
//maven {
// url file(LinphoneSdkBuildDir + '/maven_repository/')
// }
maven {
url "https://linphone.org/maven_repository"
}
......@@ -29,7 +29,7 @@ android {
applicationId "org.linphone"
minSdkVersion 23
targetSdkVersion 29
versionCode 2
versionCode 3
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......@@ -44,12 +44,12 @@ android {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
firebaseCrashlytics {
nativeSymbolUploadEnabled true
//nativeSymbolUploadEnabled true
}
}
debug {
firebaseCrashlytics {
nativeSymbolUploadEnabled true
//nativeSymbolUploadEnabled true
}
}
......@@ -90,12 +90,12 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.11.0'
kapt 'com.github.bumptech.glide:compiler:4.11.0'
implementation 'com.caverock:androidsvg-aar:1.4'
implementation 'com.google.firebase:firebase-messaging:20.2.0'
implementation 'com.google.firebase:firebase-messaging:20.2.1'
implementation 'com.google.firebase:firebase-analytics:17.4.3'
implementation 'com.google.firebase:firebase-crashlytics:17.0.1'
implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
implementation 'com.github.ybq:Android-SpinKit:1.4.0'
implementation "androidx.media:media:1.1.0"
implementation 'com.google.firebase:firebase-crashlytics-ndk:17.0.1'
implementation 'com.google.firebase:firebase-crashlytics-ndk:17.1.0'
}
......
......@@ -62,8 +62,7 @@ object Theme {
}
}
}
Log.e("[Theme] Failed retrieving gradient color:$key")
themeError()
themeError("[Theme] Failed retrieving gradient color:$key")
return null
}
......@@ -75,16 +74,14 @@ object Theme {
themeConfig.getString("colors", key, null)?.let { color ->
return Color.parseColor(color)
}
Log.e("[Theme] Failed retrieving color:$key")
themeError()
themeError("[Theme] Failed retrieving color:$key")
return 0
}
fun arbitraryValue(key: String, default: String): String {
var result: String? = themeConfig.getString("arbitrary-values", key, null)
if (result == null) {
Log.e("[Theme] Failed retrieving arbitrary value:$key")
themeError()
themeError("[Theme] Failed retrieving arbitrary value:$key")
result = default
}
return result
......@@ -93,8 +90,7 @@ object Theme {
fun arbitraryValue(key: String, default: Boolean): Boolean {
var result: Boolean? = themeConfig.getBool("arbitrary-values", key, default)
if (result == null) {
Log.e("[Theme] Failed retrieving arbitrary value:$key")
themeError()
themeError("[Theme] Failed retrieving arbitrary value:$key")
result = default
}
return result
......@@ -377,8 +373,7 @@ object Theme {
return Pair(default, selected)
}
}
Log.e("[Theme] Failed retrieving selection-effect color:$key")
themeError()
themeError("[Theme] Failed retrieving selection-effect color:$key")
return null
}
......@@ -396,7 +391,8 @@ object Theme {
return null
}
private fun themeError() {
private fun themeError(message:String? = "[Theme] there is an error in the theme. Check the stack trace below") {
Log.e(message)
themeError = true
stackStrace("Theme")
}
......
......@@ -8,7 +8,6 @@
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="windowActionBar">false</item>
......
......@@ -12,7 +12,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.3'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0-rc01"
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment