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

Remove GRUU from call log address if any

Browse source
This commit is contained in:
Sylvain Berfini 2022-04-06 12:57:58 +02:00
parent 341c112d54
commit 1f6fecb28b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,10 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
viewLifecycleOwner viewLifecycleOwner
) { ) {
it.consume { callLog -> it.consume { callLog ->
val address = callLog.remoteAddress // To remove the GRUU if any
val address = callLog.remoteAddress.clone()
address.clean()
if (coreContext.core.callsNb > 0) { if (coreContext.core.callsNb > 0) {
Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}") Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}")
sharedViewModel.updateDialerAnimationsBasedOnDestination.value = sharedViewModel.updateDialerAnimationsBasedOnDestination.value =
@ -111,6 +114,7 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
navigateToDialer(args) navigateToDialer(args)
} else { } else {
val localAddress = callLog.localAddress val localAddress = callLog.localAddress
Log.i("[History] Starting call to ${address.asStringUriOnly()} with local address ${localAddress.asStringUriOnly()}")
coreContext.startCall(address, localAddress = localAddress) coreContext.startCall(address, localAddress = localAddress)
} }
} }

5
app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
View file

@ -223,7 +223,10 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
viewLifecycleOwner, viewLifecycleOwner,
) { ) {
it.consume { callLogGroup -> it.consume { callLogGroup ->
val remoteAddress = callLogGroup.lastCallLog.remoteAddress // To remove the GRUU if any
val remoteAddress = callLogGroup.lastCallLog.remoteAddress.clone()
remoteAddress.clean()
val conferenceInfo = coreContext.core.findConferenceInformationFromUri(remoteAddress) val conferenceInfo = coreContext.core.findConferenceInformationFromUri(remoteAddress)
when { when {
conferenceInfo != null -> { conferenceInfo != null -> {