From 3aafed8677e1337f2665e4b8e2926ded5e38e711 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 15 Jun 2021 16:19:44 +0200
Subject: [PATCH] Fixed address being displayed with gruu when using 'bis'
 button on diaer & in contact editor

---
 .../org/linphone/activities/call/viewmodels/CallViewModel.kt  | 4 +---
 .../main/history/fragments/DetailCallLogFragment.kt           | 2 +-
 .../activities/main/history/viewmodels/CallLogViewModel.kt    | 4 +---
 app/src/main/java/org/linphone/utils/LinphoneUtils.kt         | 4 +++-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt
index 16a9d39a4..881d298b4 100644
--- a/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt
@@ -49,9 +49,7 @@ class CallViewModelFactory(private val call: Call) :
 
 open class CallViewModel(val call: Call) : GenericContactViewModel(call.remoteAddress) {
     val address: String by lazy {
-        val copy = call.remoteAddress.clone()
-        copy.clean() // To remove gruu if any
-        LinphoneUtils.getDisplayableAddress(copy)
+        LinphoneUtils.getDisplayableAddress(call.remoteAddress)
     }
 
     val isPaused = MutableLiveData<Boolean>()
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 401a53301..62aa964de 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
@@ -77,7 +77,7 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
             val copy = viewModel.callLog.remoteAddress.clone()
             copy.clean()
             Log.i("[History] Creating contact with SIP URI: ${copy.asStringUriOnly()}")
-            navigateToContacts(viewModel.callLog.remoteAddress.asStringUriOnly())
+            navigateToContacts(copy.asStringUriOnly())
         }
 
         binding.setContactClickListener {
diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
index 0b8b74d32..16db858a5 100644
--- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
@@ -45,9 +45,7 @@ class CallLogViewModelFactory(private val callLog: CallLog) :
 
 class CallLogViewModel(val callLog: CallLog) : GenericContactViewModel(callLog.remoteAddress) {
     val peerSipUri: String by lazy {
-        val copy = callLog.remoteAddress.clone()
-        copy.clean() // To remove gruu if any
-        LinphoneUtils.getDisplayableAddress(copy)
+        LinphoneUtils.getDisplayableAddress(callLog.remoteAddress)
     }
 
     val statusIconResource: Int by lazy {
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index cc2f90df5..8743e7d3f 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -49,7 +49,9 @@ class LinphoneUtils {
             return if (corePreferences.replaceSipUriByUsername) {
                 address.username ?: address.asStringUriOnly()
             } else {
-                address.asStringUriOnly()
+                val copy = address.clone()
+                copy.clean() // To remove gruu if any
+                copy.asStringUriOnly()
             }
         }