mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent crashes found on crashlytics

Browse source
This commit is contained in:
Sylvain Berfini 2022-11-25 13:28:44 +01:00
parent 959f87b425
commit b067f83784
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -14,7 +14,7 @@ static def getPackageName() {
def firebaseEnabled = new File(projectDir.absolutePath +'/google-services.json').exists()
def crashlyticsEnabled = new File(projectDir.absolutePath +'/google-services.json').exists() && new File(LinphoneSdkBuildDir + '/libs/').exists() && new File(LinphoneSdkBuildDir + '/libs-debug/').exists()
def crashlyticsEnabled = false//new File(projectDir.absolutePath +'/google-services.json').exists() && new File(LinphoneSdkBuildDir + '/libs/').exists() && new File(LinphoneSdkBuildDir + '/libs-debug/').exists()
if (firebaseEnabled) {

6
app/src/main/java/org/linphone/activities/GenericFragment.kt
View file

@ -130,7 +130,11 @@ abstract class GenericFragment<T : ViewDataBinding> : Fragment() {
}
protected fun goBack() {
requireActivity().onBackPressedDispatcher.onBackPressed()
try {
requireActivity().onBackPressedDispatcher.onBackPressed()
} catch (ise: IllegalStateException) {
Log.e("[Generic Fragment] ${getFragmentRealClassName()} can't go back: $ise")
}
}
private fun setupBackPressCallback() {

6
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -698,8 +698,10 @@ fun setConstraintLayoutEndMargin(view: View, margins: Float) {
}
@BindingAdapter("android:onTouch")
fun View.setTouchListener(listener: View.OnTouchListener) {
setOnTouchListener(listener)
fun View.setTouchListener(listener: View.OnTouchListener?) {
if (listener != null) {
setOnTouchListener(listener)
}
}
@BindingAdapter("entries")