From 36475d15dcd9fa46358fe5025ab7d16af84624db Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 3 Nov 2021 14:50:24 +0100
Subject: [PATCH] Fixed transfer button replaced by add call when using it to
 fill the address field with latest called address

---
 .../activities/main/dialer/fragments/DialerFragment.kt   | 9 +++++----
 .../activities/main/dialer/viewmodels/DialerViewModel.kt | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
index 44992d638..2e28b6677 100644
--- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
@@ -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) {
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt b/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
index a3b14c78c..04f9bdebe 100644
--- a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
@@ -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
         }
     }