From 4883bc8293e37c2cea1f588a809560092445caa0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 31 May 2022 15:41:37 +0200
Subject: [PATCH] Added go to contact / add to contacts option in every 1-1
 chat room menu

---
 .../org/linphone/activities/Navigation.kt     |  11 +++--
 .../chat/fragments/DetailChatRoomFragment.kt  |  40 +++++++++++++++++-
 .../main/chat/viewmodels/ChatRoomViewModel.kt |  14 ++++--
 .../fragments/DetailCallLogFragment.kt        |  11 ++---
 .../main/res/drawable-xhdpi/menu_contact.png  | Bin 0 -> 11153 bytes
 app/src/main/res/layout/chat_room_menu.xml    |  32 ++++++++++++++
 app/src/main/res/values-fr/strings.xml        |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 8 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/menu_contact.png

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 3d46cc2c1..c87133ddc 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -49,7 +49,6 @@ import org.linphone.activities.main.settings.fragments.*
 import org.linphone.activities.main.sidemenu.fragments.SideMenuFragment
 import org.linphone.activities.voip.CallActivity
 import org.linphone.activities.voip.fragments.*
-import org.linphone.core.Address
 
 internal fun Fragment.findMasterNavController(): NavController {
     return parentFragment?.parentFragment?.findNavController() ?: findNavController()
@@ -317,6 +316,11 @@ internal fun DetailChatRoomFragment.navigateToContacts(sipUriToAdd: String) {
     findMasterNavController().navigate(Uri.parse(deepLink))
 }
 
+internal fun DetailChatRoomFragment.navigateToContact(id: String) {
+    val deepLink = "linphone-android://contact/view/$id"
+    findMasterNavController().navigate(Uri.parse(deepLink))
+}
+
 internal fun DetailChatRoomFragment.navigateToImdn(args: Bundle?) {
     if (findNavController().currentDestination?.id == R.id.detailChatRoomFragment) {
         findNavController().navigate(
@@ -644,11 +648,6 @@ internal fun DetailCallLogFragment.navigateToContact(id: String) {
     findMasterNavController().navigate(Uri.parse(deepLink))
 }
 
-internal fun DetailCallLogFragment.navigateToFriend(friendAddress: Address) {
-    val deepLink = "linphone-android://contact/new/${friendAddress.asStringUriOnly()}"
-    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 d0d658ec9..0cc300f3d 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
@@ -849,7 +849,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         )
 
         val itemSize = AppUtils.getDimension(R.dimen.chat_room_popup_item_height).toInt()
-        var totalSize = itemSize * 6
+        var totalSize = itemSize * 7
 
         val notificationsTurnedOff = viewModel.areNotificationsMuted()
         if (notificationsTurnedOff) {
@@ -860,6 +860,18 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             totalSize -= itemSize
         }
 
+        if (viewModel.basicChatRoom || viewModel.oneToOneChatRoom) {
+            if (viewModel.contact.value != null) {
+                popupView.addToContactsHidden = true
+            } else {
+                popupView.goToContactHidden = true
+            }
+        } else {
+            popupView.addToContactsHidden = true
+            popupView.goToContactHidden = true
+            totalSize -= itemSize
+        }
+
         if (viewModel.basicChatRoom) {
             popupView.groupInfoHidden = true
             totalSize -= itemSize
@@ -933,6 +945,32 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             viewModel.muteNotifications(false)
             popupWindow.dismiss()
         }
+        popupView.setAddToContactsListener {
+            popupWindow.dismiss()
+            val copy = viewModel.getRemoteAddress()?.clone()
+            if (copy != null) {
+                copy.clean()
+                val address = copy.asStringUriOnly()
+                Log.i("[Chat Room] Creating contact with SIP URI: $address")
+                navigateToContacts(address)
+            }
+        }
+        popupView.setGoToContactListener {
+            popupWindow.dismiss()
+            val contactId = viewModel.contact.value?.refKey
+            if (contactId != null) {
+                Log.i("[Chat Room] Displaying contact $contactId")
+                navigateToContact(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)
+                }
+            }
+        }
 
         popupWindow.showAsDropDown(binding.menu, 0, 0, Gravity.BOTTOM)
     }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
index fc8f7dd17..de247fd3e 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
@@ -350,18 +350,24 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         lastUpdate.value = TimestampUtils.toString(chatRoom.lastUpdateTime, true)
     }
 
-    private fun searchMatchingContact() {
-        val remoteAddress = if (chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt())) {
+    fun getRemoteAddress(): Address? {
+        return if (chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt())) {
             chatRoom.peerAddress
         } else {
             if (chatRoom.participants.isNotEmpty()) {
                 chatRoom.participants[0].address
             } else {
                 Log.e("[Chat Room] $chatRoom doesn't have any participant in state ${chatRoom.state}!")
-                return
+                null
             }
         }
-        contact.value = coreContext.contactsManager.findContactByAddress(remoteAddress)
+    }
+
+    private fun searchMatchingContact() {
+        val remoteAddress = getRemoteAddress()
+        if (remoteAddress != null) {
+            contact.value = coreContext.contactsManager.findContactByAddress(remoteAddress)
+        }
     }
 
     private fun getParticipantsNames() {
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 41ffb1440..10c29b9c5 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
@@ -31,7 +31,6 @@ import org.linphone.activities.main.history.viewmodels.CallLogViewModel
 import org.linphone.activities.main.viewmodels.SharedMainViewModel
 import org.linphone.activities.navigateToContact
 import org.linphone.activities.navigateToContacts
-import org.linphone.activities.navigateToFriend
 import org.linphone.core.tools.Log
 import org.linphone.databinding.HistoryDetailFragmentBinding
 import org.linphone.utils.Event
@@ -72,9 +71,10 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
         binding.setNewContactClickListener {
             val copy = viewModel.callLog.remoteAddress.clone()
             copy.clean()
-            Log.i("[History] Creating contact with SIP URI: ${copy.asStringUriOnly()}")
+            val address = copy.asStringUriOnly()
+            Log.i("[History] Creating contact with SIP URI: $address")
             sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(R.id.masterCallLogsFragment)
-            navigateToContacts(copy.asStringUriOnly())
+            navigateToContacts(address)
         }
 
         binding.setContactClickListener {
@@ -86,8 +86,9 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
             } else {
                 val copy = viewModel.callLog.remoteAddress.clone()
                 copy.clean()
-                Log.i("[History] Displaying friend with address ${copy.asStringUriOnly()}")
-                navigateToFriend(copy)
+                val address = copy.asStringUriOnly()
+                Log.i("[History] Displaying friend with address $address")
+                navigateToContact(address)
             }
         }
 
diff --git a/app/src/main/res/drawable-xhdpi/menu_contact.png b/app/src/main/res/drawable-xhdpi/menu_contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..69de1c2a31feeb648a9b02f8633c3beadcdf693d
GIT binary patch
literal 11153
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/chat_room_menu.xml b/app/src/main/res/layout/chat_room_menu.xml
index 6c7550a2a..498605ff5 100644
--- a/app/src/main/res/layout/chat_room_menu.xml
+++ b/app/src/main/res/layout/chat_room_menu.xml
@@ -37,6 +37,18 @@
         <variable
             name="unmuteHidden"
             type="Boolean" />
+        <variable
+            name="addToContactsListener"
+            type="View.OnClickListener" />
+        <variable
+            name="addToContactsHidden"
+            type="Boolean" />
+        <variable
+            name="goToContactListener"
+            type="View.OnClickListener" />
+        <variable
+            name="goToContactHidden"
+            type="Boolean" />
     </data>
 
     <LinearLayout
@@ -45,6 +57,26 @@
         android:orientation="vertical"
         android:background="?attr/backgroundColor">
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/chat_room_popup_item_height"
+            android:visibility="@{addToContactsHidden ? View.GONE : View.VISIBLE}"
+            android:background="@drawable/menu_background"
+            android:onClick="@{addToContactsListener}"
+            style="@style/popup_item_font"
+            android:text="@string/chat_message_context_menu_add_to_contacts"
+            app:drawableRightCompat="@drawable/menu_add_contact" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/chat_room_popup_item_height"
+            android:visibility="@{goToContactHidden ? View.GONE : View.VISIBLE}"
+            android:background="@drawable/menu_background"
+            android:onClick="@{goToContactListener}"
+            style="@style/popup_item_font"
+            android:text="@string/chat_room_context_menu_go_to_contact"
+            app:drawableRightCompat="@drawable/menu_contact" />
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="@dimen/chat_room_popup_item_height"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3094bf385..407806118 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -730,4 +730,5 @@
     <string name="chat_message_context_menu_turn_off_notifications">Désactiver les notifications</string>
     <string name="chat_message_context_menu_turn_on_notifications">Activer les notifications</string>
     <string name="content_description_muted_chat_room">Les notifications sont désactivées pour cette conversation</string>
+    <string name="chat_room_context_menu_go_to_contact">Voir le contact</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34da62b26..8c61db21f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,6 +188,7 @@
     <string name="chat_room_file_not_found">File not found</string>
     <string name="chat_room_context_menu_group_info">Group info</string>
     <string name="chat_room_context_menu_participants_devices">Conversation\'s devices</string>
+    <string name="chat_room_context_menu_go_to_contact">Go to contact</string>
     <string name="chat_message_context_menu_ephemeral_messages">Ephemeral messages</string>
     <string name="chat_message_context_menu_delete_messages">Delete messages</string>
     <string name="chat_message_context_menu_turn_off_notifications">Disable notifications</string>