From 400e64e18e030896f29a80beff3d75c7e961da9e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Jan 2021 18:02:00 +0100
Subject: [PATCH] Fixed navigation issue after saving changes in contact editor

---
 app/src/main/java/org/linphone/activities/Navigation.kt  | 9 +++++++--
 .../main/res/navigation-sw533dp/contacts_nav_graph.xml   | 3 +++
 app/src/main/res/navigation/contacts_nav_graph.xml       | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 0b2699842..62386c712 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -445,8 +445,13 @@ internal fun MasterContactsFragment.navigateToContactEditor(sipUriToAdd: String?
 }
 
 internal fun ContactEditorFragment.navigateToContact(contact: NativeContact) {
-    val deepLink = "linphone-android://contact/view/${contact.nativeId}"
-    findMasterNavController().navigate(Uri.parse(deepLink), getRightToLeftAnimationNavOptions())
+    val bundle = Bundle()
+    bundle.putString("id", contact.nativeId)
+    findNavController().navigate(
+        R.id.action_contactEditorFragment_to_detailContactFragment,
+        bundle,
+        getRightToLeftAnimationNavOptions(R.id.detailContactFragment, true)
+    )
 }
 
 internal fun DetailContactFragment.navigateToChatRoom(args: Bundle?) {
diff --git a/app/src/main/res/navigation-sw533dp/contacts_nav_graph.xml b/app/src/main/res/navigation-sw533dp/contacts_nav_graph.xml
index 46d6eb3f1..5c1c9a794 100644
--- a/app/src/main/res/navigation-sw533dp/contacts_nav_graph.xml
+++ b/app/src/main/res/navigation-sw533dp/contacts_nav_graph.xml
@@ -24,6 +24,9 @@
             android:name="SipUri"
             app:argType="string"
             app:nullable="true" />
+        <action
+            android:id="@+id/action_contactEditorFragment_to_detailContactFragment"
+            app:destination="@id/detailContactFragment" />
     </fragment>
 
     <fragment
diff --git a/app/src/main/res/navigation/contacts_nav_graph.xml b/app/src/main/res/navigation/contacts_nav_graph.xml
index cd23f0df9..8a9be47d8 100644
--- a/app/src/main/res/navigation/contacts_nav_graph.xml
+++ b/app/src/main/res/navigation/contacts_nav_graph.xml
@@ -25,6 +25,10 @@
         android:id="@+id/contactEditorFragment"
         android:name="org.linphone.activities.main.contact.fragments.ContactEditorFragment"
         tools:layout="@layout/contact_editor_fragment"
-        android:label="ContactEditorFragment" />
+        android:label="ContactEditorFragment" >
+        <action
+            android:id="@+id/action_contactEditorFragment_to_detailContactFragment"
+            app:destination="@id/detailContactFragment" />
+    </fragment>
 
 </navigation>
\ No newline at end of file