From 536bfd0020ab04321c853cd5940d1fe897f9ad19 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 24 Feb 2023 11:26:31 +0100
Subject: [PATCH] Fixed navigating to contact without a native ID

---
 .../java/org/linphone/activities/Navigation.kt     | 14 ++++++++++++--
 .../main/chat/fragments/DetailChatRoomFragment.kt  |  8 ++++----
 .../contact/fragments/MasterContactsFragment.kt    | 14 +++++++++-----
 .../history/fragments/DetailCallLogFragment.kt     | 13 ++++++-------
 .../main/res/layout/history_detail_fragment.xml    |  2 +-
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index d192cae85..f5515890a 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -314,11 +314,16 @@ internal fun DetailChatRoomFragment.navigateToContacts(sipUriToAdd: String) {
     findMasterNavController().navigate(Uri.parse(deepLink))
 }
 
-internal fun DetailChatRoomFragment.navigateToContact(id: String) {
+internal fun DetailChatRoomFragment.navigateToNativeContact(id: String) {
     val deepLink = "linphone-android://contact/view/$id"
     findMasterNavController().navigate(Uri.parse(deepLink))
 }
 
+internal fun DetailChatRoomFragment.navigateToFriend(address: String) {
+    val deepLink = "linphone-android://contact/view-friend/$address"
+    findMasterNavController().navigate(Uri.parse(deepLink))
+}
+
 internal fun DetailChatRoomFragment.navigateToImdn(args: Bundle?) {
     if (findNavController().currentDestination?.id == R.id.detailChatRoomFragment) {
         findNavController().navigate(
@@ -626,11 +631,16 @@ internal fun DetailCallLogFragment.navigateToContacts(sipUriToAdd: String) {
     findMasterNavController().navigate(Uri.parse(deepLink))
 }
 
-internal fun DetailCallLogFragment.navigateToContact(id: String) {
+internal fun DetailCallLogFragment.navigateToNativeContact(id: String) {
     val deepLink = "linphone-android://contact/view/$id"
     findMasterNavController().navigate(Uri.parse(deepLink))
 }
 
+internal fun DetailCallLogFragment.navigateToFriend(address: String) {
+    val deepLink = "linphone-android://contact/view-friend/$address"
+    findMasterNavController().navigate(Uri.parse(deepLink))
+}
+
 internal fun DetailCallLogFragment.navigateToChatRoom(args: Bundle?) {
     if (findNavController().currentDestination?.id == R.id.detailCallLogFragment) {
         findMasterNavController().navigate(
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index ae83d7405..541ce6475 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -1061,15 +1061,15 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             popupWindow.dismiss()
             val contactId = viewModel.contact.value?.refKey
             if (contactId != null) {
-                Log.i("[Chat Room] Displaying contact $contactId")
-                navigateToContact(contactId)
+                Log.i("[Chat Room] Displaying native contact [$contactId]")
+                navigateToNativeContact(contactId)
             } else {
                 val copy = viewModel.getRemoteAddress()?.clone()
                 if (copy != null) {
                     copy.clean()
                     val address = copy.asStringUriOnly()
-                    Log.i("[Chat Room] Displaying friend with address $address")
-                    navigateToContact(address)
+                    Log.i("[Chat Room] Displaying friend with address [$address]")
+                    navigateToFriend(address)
                 }
             }
         }
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 8c2f2c197..76b7acf52 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
@@ -237,8 +237,10 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
                 val contact = coreContext.contactsManager.findContactById(id)
                 if (contact != null) {
                     contactIdToDisplay = null
-                    Log.i("[Contacts] Found matching contact $contact after callback")
+                    Log.i("[Contacts] Found matching contact [$contact] after callback")
                     adapter.selectedContactEvent.value = Event(contact)
+                } else {
+                    Log.w("[Contacts] No contact found matching id [$id] after callback")
                 }
             }
             adapter.submitList(it)
@@ -285,28 +287,30 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
         arguments?.clear()
 
         if (id != null) {
-            Log.i("[Contacts] Found contact id parameter in arguments: $id")
+            Log.i("[Contacts] Found contact id parameter in arguments [$id]")
             val contact = coreContext.contactsManager.findContactById(id)
             if (contact != null) {
-                Log.i("[Contacts] Found matching contact $contact")
+                Log.i("[Contacts] Found matching contact [${contact.name}]")
                 adapter.selectedContactEvent.value = Event(contact)
             } else {
                 Log.w("[Contacts] Matching contact not found yet, waiting for contacts updated callback")
                 contactIdToDisplay = id
             }
         } else if (sipUri != null) {
-            Log.i("[Contacts] Found sipUri parameter in arguments: $sipUri")
+            Log.i("[Contacts] Found sipUri parameter in arguments [$sipUri]")
             sipUriToAdd = sipUri
             (activity as MainActivity).showSnackBar(R.string.contact_choose_existing_or_new_to_add_number)
             editOnClick = true
         } else if (addressString != null) {
             val address = Factory.instance().createAddress(addressString)
             if (address != null) {
-                Log.i("[Contacts] Found friend native pointer parameter in arguments: ${address.asStringUriOnly()}")
+                Log.i("[Contacts] Found friend SIP address parameter in arguments [${address.asStringUriOnly()}]")
                 val contact = coreContext.contactsManager.findContactByAddress(address)
                 if (contact != null) {
                     Log.i("[Contacts] Found matching contact $contact")
                     adapter.selectedContactEvent.value = Event(contact)
+                } else {
+                    Log.w("[Contacts] No matching contact found for SIP address [${address.asStringUriOnly()}]")
                 }
             }
         }
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
index 8395b788b..0265d3d83 100644
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
@@ -27,7 +27,6 @@ import org.linphone.R
 import org.linphone.activities.*
 import org.linphone.activities.main.*
 import org.linphone.activities.main.history.viewmodels.CallLogViewModel
-import org.linphone.activities.navigateToContact
 import org.linphone.activities.navigateToContacts
 import org.linphone.core.tools.Log
 import org.linphone.databinding.HistoryDetailFragmentBinding
@@ -62,7 +61,7 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
             val copy = viewModel.callLog.remoteAddress.clone()
             copy.clean()
             val address = copy.asStringUriOnly()
-            Log.i("[History] Creating contact with SIP URI: $address")
+            Log.i("[History] Creating contact with SIP URI [$address]")
             sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(R.id.masterCallLogsFragment)
             navigateToContacts(address)
         }
@@ -71,14 +70,14 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
             sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(R.id.masterCallLogsFragment)
             val contactId = viewModel.contact.value?.refKey
             if (contactId != null) {
-                Log.i("[History] Displaying contact $contactId")
-                navigateToContact(contactId)
+                Log.i("[History] Displaying native contact [$contactId]")
+                navigateToNativeContact(contactId)
             } else {
                 val copy = viewModel.callLog.remoteAddress.clone()
                 copy.clean()
                 val address = copy.asStringUriOnly()
-                Log.i("[History] Displaying friend with address $address")
-                navigateToContact(address)
+                Log.i("[History] Displaying friend with address [$address]")
+                navigateToFriend(address)
             }
         }
 
@@ -91,7 +90,7 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
                 address.clean()
 
                 if (coreContext.core.callsNb > 0) {
-                    Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}")
+                    Log.i("[History] Starting dialer with pre-filled URI [${address.asStringUriOnly()}], is transfer? ${sharedViewModel.pendingCallTransfer}")
                     sharedViewModel.updateDialerAnimationsBasedOnDestination.value =
                         Event(R.id.masterCallLogsFragment)
 
diff --git a/app/src/main/res/layout/history_detail_fragment.xml b/app/src/main/res/layout/history_detail_fragment.xml
index 83de8b297..c5295d5ea 100644
--- a/app/src/main/res/layout/history_detail_fragment.xml
+++ b/app/src/main/res/layout/history_detail_fragment.xml
@@ -59,7 +59,7 @@
 
             <ImageView
                 android:onClick="@{contactClickListener}"
-                android:visibility="@{viewModel.contact == null || viewModel.contact.refKey == null ? View.GONE : View.VISIBLE}"
+                android:visibility="@{viewModel.contact == null ? View.GONE : View.VISIBLE}"
                 android:contentDescription="@string/content_description_go_to_contact"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"