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

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

View file

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

View file

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