From b067f83784e96d166a3d40dca83f0d4a328adc13 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 25 Nov 2022 13:28:44 +0100
Subject: [PATCH] Prevent crashes found on crashlytics

---
 app/build.gradle                                            | 2 +-
 .../main/java/org/linphone/activities/GenericFragment.kt    | 6 +++++-
 app/src/main/java/org/linphone/utils/DataBindingUtils.kt    | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index af4aa5907..ae44d1dc9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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) {
diff --git a/app/src/main/java/org/linphone/activities/GenericFragment.kt b/app/src/main/java/org/linphone/activities/GenericFragment.kt
index bc0f831e9..5a2652a9c 100644
--- a/app/src/main/java/org/linphone/activities/GenericFragment.kt
+++ b/app/src/main/java/org/linphone/activities/GenericFragment.kt
@@ -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() {
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index 278ed9efb..3e85dcf25 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -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")