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

Fixed transfer button replaced by add call when using it to fill the address field with latest called address

Browse source
This commit is contained in:
Sylvain Berfini 2021-11-03 14:50:24 +01:00
parent f66c90d356
commit 36475d15dc
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
View file

@ -101,11 +101,12 @@ class DialerFragment : SecureFragment<DialerFragmentBinding>() {
} }
binding.setTransferCallClickListener { binding.setTransferCallClickListener {
viewModel.transferCall() if (viewModel.transferCall()) {
// Transfer has been consumed // Transfer has been consumed, otherwise it might have been a "bis" use
sharedViewModel.pendingCallTransfer = false sharedViewModel.pendingCallTransfer = false
viewModel.transferVisibility.value = false viewModel.transferVisibility.value = false
} }
}
if (arguments?.containsKey("Transfer") == true) { if (arguments?.containsKey("Transfer") == true) {
sharedViewModel.pendingCallTransfer = arguments?.getBoolean("Transfer") ?: false sharedViewModel.pendingCallTransfer = arguments?.getBoolean("Transfer") ?: false

6
app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
View file

@ -208,13 +208,15 @@ class DialerViewModel : LogsUploadViewModel() {
} }
} }
fun transferCall() { fun transferCall(): Boolean {
val addressToCall = enteredUri.value.orEmpty() val addressToCall = enteredUri.value.orEmpty()
if (addressToCall.isNotEmpty()) { return if (addressToCall.isNotEmpty()) {
coreContext.transferCallTo(addressToCall) coreContext.transferCallTo(addressToCall)
eraseAll() eraseAll()
true
} else { } else {
setLastOutgoingCallAddress() setLastOutgoingCallAddress()
false
} }
} }