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

Fixed conference call from history

Browse source
This commit is contained in:
Sylvain Berfini 2022-04-06 19:55:47 +02:00
parent f33eec8617
commit d366dbf2cc
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -224,8 +224,9 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
) { ) {
it.consume { callLogGroup -> it.consume { callLogGroup ->
// To remove the GRUU if any // To remove the GRUU if any
val remoteAddress = callLogGroup.lastCallLog.remoteAddress.clone() val remoteAddress = callLogGroup.lastCallLog.remoteAddress
remoteAddress.clean() val cleanAddress = remoteAddress.clone()
cleanAddress.clean()
val conferenceInfo = coreContext.core.findConferenceInformationFromUri(remoteAddress) val conferenceInfo = coreContext.core.findConferenceInformationFromUri(remoteAddress)
when { when {
@ -233,18 +234,18 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
navigateToConferenceWaitingRoom(remoteAddress.asStringUriOnly(), conferenceInfo.subject) navigateToConferenceWaitingRoom(remoteAddress.asStringUriOnly(), conferenceInfo.subject)
} }
coreContext.core.callsNb > 0 -> { coreContext.core.callsNb > 0 -> {
Log.i("[History] Starting dialer with pre-filled URI ${remoteAddress.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}") Log.i("[History] Starting dialer with pre-filled URI ${cleanAddress.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}")
sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(R.id.masterCallLogsFragment) sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(R.id.masterCallLogsFragment)
val args = Bundle() val args = Bundle()
args.putString("URI", remoteAddress.asStringUriOnly()) args.putString("URI", cleanAddress.asStringUriOnly())
args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer) args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
args.putBoolean("SkipAutoCallStart", true) // If auto start call setting is enabled, ignore it args.putBoolean("SkipAutoCallStart", true) // If auto start call setting is enabled, ignore it
navigateToDialer(args) navigateToDialer(args)
} }
else -> { else -> {
val localAddress = callLogGroup.lastCallLog.localAddress val localAddress = callLogGroup.lastCallLog.localAddress
Log.i("[History] Starting call to ${remoteAddress.asStringUriOnly()} with local address ${localAddress.asStringUriOnly()}") Log.i("[History] Starting call to ${cleanAddress.asStringUriOnly()} with local address ${localAddress.asStringUriOnly()}")
coreContext.startCall(remoteAddress, localAddress = localAddress) coreContext.startCall(cleanAddress, localAddress = localAddress)
} }
} }
} }