From a0511246cd10266c3cb3e3754bb8d37228be2ac6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 9 Apr 2021 17:55:24 +0200
Subject: [PATCH] Fixed wrong uses of Address.clean()

---
 .../activities/call/viewmodels/CallViewModel.kt     |  5 +++--
 .../main/chat/adapters/ChatMessagesListAdapter.kt   |  5 +++--
 .../main/history/fragments/DetailCallLogFragment.kt | 13 +++++++------
 .../main/history/viewmodels/CallLogViewModel.kt     |  5 +++--
 4 files changed, 16 insertions(+), 12 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 a07d1fe3c..7836a93ab 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,8 +49,9 @@ class CallViewModelFactory(private val call: Call) :
 
 open class CallViewModel(val call: Call) : GenericContactViewModel(call.remoteAddress) {
     val address: String by lazy {
-        call.remoteAddress.clean() // To remove gruu if any
-        LinphoneUtils.getDisplayableAddress(call.remoteAddress)
+        val copy = call.remoteAddress.clone()
+        copy.clean() // To remove gruu if any
+        LinphoneUtils.getDisplayableAddress(copy)
     }
 
     val isPaused = MutableLiveData<Boolean>()
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
index de25ba9d1..44ac99b3a 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
@@ -293,8 +293,9 @@ class ChatMessagesListAdapter(
         private fun addSenderToContacts() {
             val chatMessage = binding.viewModel?.chatMessage
             if (chatMessage != null) {
-                chatMessage.fromAddress.clean() // To remove gruu if any
-                addSipUriToContactEvent.value = Event(chatMessage.fromAddress.asStringUriOnly())
+                val copy = chatMessage.fromAddress.clone()
+                copy.clean() // To remove gruu if any
+                addSipUriToContactEvent.value = Event(copy.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 e6eb67045..30cb8c874 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
@@ -69,8 +69,9 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
         binding.back.visibility = if (resources.getBoolean(R.bool.isTablet)) View.INVISIBLE else View.VISIBLE
 
         binding.setNewContactClickListener {
-            viewModel.callLog.remoteAddress.clean()
-            Log.i("[History] Creating contact with SIP URI: ${viewModel.callLog.remoteAddress.asStringUriOnly()}")
+            val copy = viewModel.callLog.remoteAddress.clone()
+            copy.clean()
+            Log.i("[History] Creating contact with SIP URI: ${copy.asStringUriOnly()}")
             navigateToContacts(viewModel.callLog.remoteAddress.asStringUriOnly())
         }
 
@@ -80,10 +81,10 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
                 Log.i("[History] Displaying contact $contact")
                 navigateToContact(contact)
             } else {
-                val address = viewModel.callLog.remoteAddress
-                address.clean()
-                Log.i("[History] Displaying friend with address ${address.asStringUriOnly()}")
-                navigateToFriend(address)
+                val copy = viewModel.callLog.remoteAddress.clone()
+                copy.clean()
+                Log.i("[History] Displaying friend with address ${copy.asStringUriOnly()}")
+                navigateToFriend(copy)
             }
         }
 
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 3aa1dfdb3..b4f0c00dd 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,8 +45,9 @@ class CallLogViewModelFactory(private val callLog: CallLog) :
 
 class CallLogViewModel(val callLog: CallLog) : GenericContactViewModel(callLog.remoteAddress) {
     val peerSipUri: String by lazy {
-        callLog.remoteAddress.clean() // To remove gruu if any
-        LinphoneUtils.getDisplayableAddress(callLog.remoteAddress)
+        val copy = callLog.remoteAddress.clone()
+        copy.clean() // To remove gruu if any
+        LinphoneUtils.getDisplayableAddress(copy)
     }
 
     val statusIconResource: Int by lazy {