Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed address being displayed with gruu when using 'bis' button on diaer & in contact editor

Browse source
This commit is contained in:
Sylvain Berfini 2021-06-15 16:19:44 +02:00
parent 61d2fdbe10
commit 3aafed8677
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt
View file

@ -49,9 +49,7 @@ class CallViewModelFactory(private val call: Call) :
open class CallViewModel(val call: Call) : GenericContactViewModel(call.remoteAddress) { open class CallViewModel(val call: Call) : GenericContactViewModel(call.remoteAddress) {
val address: String by lazy { val address: String by lazy {
val copy = call.remoteAddress.clone() LinphoneUtils.getDisplayableAddress(call.remoteAddress)
copy.clean() // To remove gruu if any
LinphoneUtils.getDisplayableAddress(copy)
} }
val isPaused = MutableLiveData<Boolean>() val isPaused = MutableLiveData<Boolean>()

2
app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
View file

@ -77,7 +77,7 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
val copy = viewModel.callLog.remoteAddress.clone() val copy = viewModel.callLog.remoteAddress.clone()
copy.clean() copy.clean()
Log.i("[History] Creating contact with SIP URI: ${copy.asStringUriOnly()}") Log.i("[History] Creating contact with SIP URI: ${copy.asStringUriOnly()}")
navigateToContacts(viewModel.callLog.remoteAddress.asStringUriOnly()) navigateToContacts(copy.asStringUriOnly())
} }
binding.setContactClickListener { binding.setContactClickListener {

4
app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
View file

@ -45,9 +45,7 @@ class CallLogViewModelFactory(private val callLog: CallLog) :
class CallLogViewModel(val callLog: CallLog) : GenericContactViewModel(callLog.remoteAddress) { class CallLogViewModel(val callLog: CallLog) : GenericContactViewModel(callLog.remoteAddress) {
val peerSipUri: String by lazy { val peerSipUri: String by lazy {
val copy = callLog.remoteAddress.clone() LinphoneUtils.getDisplayableAddress(callLog.remoteAddress)
copy.clean() // To remove gruu if any
LinphoneUtils.getDisplayableAddress(copy)
} }
val statusIconResource: Int by lazy { val statusIconResource: Int by lazy {

4
app/src/main/java/org/linphone/utils/LinphoneUtils.kt
View file

@ -49,7 +49,9 @@ class LinphoneUtils {
return if (corePreferences.replaceSipUriByUsername) { return if (corePreferences.replaceSipUriByUsername) {
address.username ?: address.asStringUriOnly() address.username ?: address.asStringUriOnly()
} else { } else {
address.asStringUriOnly() val copy = address.clone()
copy.clean() // To remove gruu if any
copy.asStringUriOnly()
} }
} }