From 70fe94098b922867fb13a231be48d22b4deb65b7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 7 Sep 2021 16:51:56 +0200
Subject: [PATCH] Removed unused variable + prevent crash when destination
 isn't found

---
 .../org/linphone/activities/Navigation.kt     | 21 ++++++++++++-------
 .../chat/fragments/MasterChatRoomsFragment.kt |  4 ++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 4f0d8058b..7f18c78d2 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -78,8 +78,10 @@ internal fun TabsFragment.navigateToCallHistory() {
     val action = when (findNavController().currentDestination?.id) {
         R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_masterCallLogsFragment
         R.id.dialerFragment -> R.id.action_dialerFragment_to_masterCallLogsFragment
-        else -> R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment
+        R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment
+        else -> 0
     }
+    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -91,8 +93,10 @@ internal fun TabsFragment.navigateToContacts() {
     val action = when (findNavController().currentDestination?.id) {
         R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_masterContactsFragment
         R.id.dialerFragment -> R.id.action_dialerFragment_to_masterContactsFragment
-        else -> R.id.action_masterChatRoomsFragment_to_masterContactsFragment
+        R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_masterContactsFragment
+        else -> 0
     }
+    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -104,8 +108,10 @@ internal fun TabsFragment.navigateToDialer() {
     val action = when (findNavController().currentDestination?.id) {
         R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_dialerFragment
         R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_dialerFragment
-        else -> R.id.action_masterChatRoomsFragment_to_dialerFragment
+        R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_dialerFragment
+        else -> 0
     }
+    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -117,8 +123,10 @@ internal fun TabsFragment.navigateToChatRooms() {
     val action = when (findNavController().currentDestination?.id) {
         R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment
         R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_masterChatRoomsFragment
-        else -> R.id.action_dialerFragment_to_masterChatRoomsFragment
+        R.id.dialerFragment -> R.id.action_dialerFragment_to_masterChatRoomsFragment
+        else -> 0
     }
+    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -147,10 +155,7 @@ internal fun DialerFragment.navigateToConfigFileViewer() {
 
 /* Chat related */
 
-internal fun MasterChatRoomsFragment.navigateToChatRoom(
-    args: Bundle,
-    slidingPane: SlidingPaneLayout
-) {
+internal fun MasterChatRoomsFragment.navigateToChatRoom(args: Bundle) {
     val navHostFragment =
         childFragmentManager.findFragmentById(R.id.chat_nav_container) as NavHostFragment
     val previousBackStackEntry = navHostFragment.navController.currentBackStackEntry
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 201107ec7..bf7626a5a 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
@@ -253,7 +253,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                         sharedViewModel.destructionPendingChatRoom = chatRoom
                     } else {
                         sharedViewModel.selectedChatRoom.value = chatRoom
-                        navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel), binding.slidingPane)
+                        navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel))
                     }
                 }
             }
@@ -294,7 +294,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             Log.w("[Chat] Found pending chat room from before activity was recreated")
             sharedViewModel.destructionPendingChatRoom = null
             sharedViewModel.selectedChatRoom.value = pendingDestructionChatRoom
-            navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel), binding.slidingPane)
+            navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel))
         }
 
         val localSipUri = arguments?.getString("LocalSipUri")