From 70575d73ba72e17f0fc567a537b0c756cb8f9617 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 20 Dec 2021 14:39:05 +0100
Subject: [PATCH] Removed unused code + attempt to workaround ANR since last
 dependencies update

---
 .../org/linphone/activities/GenericFragment.kt    | 10 +++++++++-
 .../chat/fragments/MasterChatRoomsFragment.kt     | 12 ------------
 .../contact/fragments/MasterContactsFragment.kt   | 15 ---------------
 .../history/fragments/MasterCallLogsFragment.kt   | 15 ---------------
 4 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/GenericFragment.kt b/app/src/main/java/org/linphone/activities/GenericFragment.kt
index 94bbfaffa..0ee63ec55 100644
--- a/app/src/main/java/org/linphone/activities/GenericFragment.kt
+++ b/app/src/main/java/org/linphone/activities/GenericFragment.kt
@@ -28,8 +28,12 @@ import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.transition.MaterialSharedAxis
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.core.tools.Log
 
@@ -40,7 +44,11 @@ abstract class GenericFragment<T : ViewDataBinding> : Fragment() {
 
     protected val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            goBack()
+            lifecycleScope.launch {
+                withContext(Dispatchers.Main) {
+                    goBack()
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index a422447ab..3f3f88025 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -145,18 +145,6 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             }
         )
         binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
-        binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
-            override fun onPanelSlide(panel: View, slideOffset: Float) { }
-
-            override fun onPanelOpened(panel: View) { }
-
-            override fun onPanelClosed(panel: View) {
-                if (binding.slidingPane.isSlideable) {
-                    // (requireActivity() as MainActivity).showTabsFragment()
-                    coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
-                }
-            }
-        })
 
         /* End of shared view model & sliding pane related */
 
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
index ff87f2483..c751b5ae2 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
@@ -139,21 +139,6 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
             }
         )
         binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
-        /*binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
-            override fun onPanelSlide(panel: View, slideOffset: Float) { }
-
-            override fun onPanelOpened(panel: View) {
-                if (binding.slidingPane.isSlideable) {
-                    (requireActivity() as MainActivity).hideTabsFragment()
-                }
-            }
-
-            override fun onPanelClosed(panel: View) {
-                if (binding.slidingPane.isSlideable) {
-                    (requireActivity() as MainActivity).showTabsFragment()
-                }
-            }
-        })*/
 
         /* End of shared view model & sliding pane related */
 
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
index b597d21e4..421e98cae 100644
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
@@ -126,21 +126,6 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
             }
         )
         binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
-        /*binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
-            override fun onPanelSlide(panel: View, slideOffset: Float) { }
-
-            override fun onPanelOpened(panel: View) {
-                if (binding.slidingPane.isSlideable) {
-                    (requireActivity() as MainActivity).hideTabsFragment()
-                }
-            }
-
-            override fun onPanelClosed(panel: View) {
-                if (binding.slidingPane.isSlideable) {
-                    (requireActivity() as MainActivity).showTabsFragment()
-                }
-            }
-        })*/
 
         /* End of shared view model & sliding pane related */