diff --git a/app/src/main/java/org/linphone/activities/voip/data/CallData.kt b/app/src/main/java/org/linphone/activities/voip/data/CallData.kt index 5abe932bb..8e9d5779a 100644 --- a/app/src/main/java/org/linphone/activities/voip/data/CallData.kt +++ b/app/src/main/java/org/linphone/activities/voip/data/CallData.kt @@ -35,7 +35,7 @@ open class CallData(val call: Call) : GenericContactData(call.remoteAddress) { fun onShowContextMenu(anchor: View, callData: CallData) } - val address = call.remoteAddress.asStringUriOnly() + val displayableAddress = MutableLiveData() val isPaused = MutableLiveData() val isRemotelyPaused = MutableLiveData() @@ -90,6 +90,10 @@ open class CallData(val call: Call) : GenericContactData(call.remoteAddress) { call.addListener(listener) isRemotelyRecorded.value = call.remoteParams?.isRecording + val clone = call.remoteAddress.clone() + clone.clean() // To remove GRUU if any + displayableAddress.value = clone.asStringUriOnly() + update() // initChatRoom() diff --git a/app/src/main/res/layout/voip_call_incoming_fragment.xml b/app/src/main/res/layout/voip_call_incoming_fragment.xml index 588536a4a..2eec41254 100644 --- a/app/src/main/res/layout/voip_call_incoming_fragment.xml +++ b/app/src/main/res/layout/voip_call_incoming_fragment.xml @@ -94,7 +94,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:text="@{callsViewModel.currentCallData.address, default=`sip:bilbo.baggins@sip.linphone.org`}" + android:text="@{callsViewModel.currentCallData.displayableAddress, default=`sip:bilbo.baggins@sip.linphone.org`}" app:layout_constraintBottom_toTopOf="@id/buttons" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/voip_call_outgoing_fragment.xml b/app/src/main/res/layout/voip_call_outgoing_fragment.xml index a8c5ba11f..c8b21137c 100644 --- a/app/src/main/res/layout/voip_call_outgoing_fragment.xml +++ b/app/src/main/res/layout/voip_call_outgoing_fragment.xml @@ -90,7 +90,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:text="@{callsViewModel.currentCallData.remoteConferenceSubject.length > 0 ? @string/conference : callsViewModel.currentCallData.address, default=`sip:bilbo.baggins@sip.linphone.org`}" + android:text="@{callsViewModel.currentCallData.remoteConferenceSubject.length > 0 ? @string/conference : callsViewModel.currentCallData.displayableAddress, default=`sip:bilbo.baggins@sip.linphone.org`}" app:layout_constraintBottom_toTopOf="@id/buttons" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/voip_calls_cell.xml b/app/src/main/res/layout/voip_calls_cell.xml index 2cbd37552..f7ad6bcce 100644 --- a/app/src/main/res/layout/voip_calls_cell.xml +++ b/app/src/main/res/layout/voip_calls_cell.xml @@ -84,7 +84,7 @@ android:maxLines="1" android:ellipsize="end" style="@style/call_list_active_sip_uri_font" - android:text="@{data.address, default=`bilbo.baggins@sip.linphone.org`}"/> + android:text="@{data.displayableAddress, default=`bilbo.baggins@sip.linphone.org`}"/> @@ -120,7 +120,7 @@ android:maxLines="1" android:ellipsize="end" style="@style/call_list_sip_uri_font" - android:text="@{data.address, default=`bilbo.baggins@sip.linphone.org`}"/> + android:text="@{data.displayableAddress, default=`bilbo.baggins@sip.linphone.org`}"/> diff --git a/app/src/main/res/layout/voip_single_call_fragment.xml b/app/src/main/res/layout/voip_single_call_fragment.xml index c533d23f8..3b05f6e71 100644 --- a/app/src/main/res/layout/voip_single_call_fragment.xml +++ b/app/src/main/res/layout/voip_single_call_fragment.xml @@ -76,7 +76,7 @@ android:layout_marginStart="10dp" android:ellipsize="end" android:maxLines="1" - android:text="@{callsViewModel.currentCallData.address, default=`sip:johndoe@sip.linphone.org`}" + android:text="@{callsViewModel.currentCallData.displayableAddress, default=`sip:johndoe@sip.linphone.org`}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/remote_name" />