From eb83e7e5afb3ca1b6108e4c0b4d86729e5888582 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Nov 2021 17:36:04 +0100
Subject: [PATCH] Fixed bottom tabs not responding to click due to null current
 destination in nav controller

---
 .../main/java/org/linphone/activities/Navigation.kt  | 12 ++++--------
 app/src/main/res/navigation/main_nav_graph.xml       |  6 ++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 90d07c331..abfe51e11 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -103,9 +103,8 @@ internal fun TabsFragment.navigateToCallHistory() {
         R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_masterCallLogsFragment
         R.id.dialerFragment -> R.id.action_dialerFragment_to_masterCallLogsFragment
         R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment
-        else -> 0
+        else -> R.id.action_global_masterCallLogsFragment
     }
-    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -118,9 +117,8 @@ internal fun TabsFragment.navigateToContacts() {
         R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_masterContactsFragment
         R.id.dialerFragment -> R.id.action_dialerFragment_to_masterContactsFragment
         R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_masterContactsFragment
-        else -> 0
+        else -> R.id.action_global_masterContactsFragment
     }
-    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -133,9 +131,8 @@ internal fun TabsFragment.navigateToDialer() {
         R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_dialerFragment
         R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_dialerFragment
         R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_dialerFragment
-        else -> 0
+        else -> R.id.action_global_dialerFragment
     }
-    if (action == 0) return
     findNavController().navigate(
         action,
         null,
@@ -148,9 +145,8 @@ internal fun TabsFragment.navigateToChatRooms() {
         R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment
         R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_masterChatRoomsFragment
         R.id.dialerFragment -> R.id.action_dialerFragment_to_masterChatRoomsFragment
-        else -> 0
+        else -> R.id.action_global_masterChatRoomsFragment
     }
-    if (action == 0) return
     findNavController().navigate(
         action,
         null,
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
index 3f6f05195..5a9df56af 100644
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ b/app/src/main/res/navigation/main_nav_graph.xml
@@ -64,6 +64,9 @@
             app:uri="linphone-android://contact/new/{sipUri}"
             android:autoVerify="true" />
     </fragment>
+    <action
+        android:id="@+id/action_global_masterContactsFragment"
+        app:destination="@id/masterContactsFragment" />
     <fragment
         android:id="@+id/masterCallLogsFragment"
         android:name="org.linphone.activities.main.history.fragments.MasterCallLogsFragment"
@@ -79,6 +82,9 @@
             android:id="@+id/action_masterCallLogsFragment_to_masterChatRoomsFragment"
             app:destination="@id/masterChatRoomsFragment" />
     </fragment>
+    <action
+        android:id="@+id/action_global_masterCallLogsFragment"
+        app:destination="@id/masterCallLogsFragment"/>
     <fragment
         android:id="@+id/dialerFragment"
         android:name="org.linphone.activities.main.dialer.fragments.DialerFragment"