From 7d5ead8ba0aa058a69f5e81066eff9de1c1c697c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 22 Nov 2019 16:12:56 +0100
Subject: [PATCH] Fixed call transfer button

---
 .../main/java/org/linphone/call/CallActivity.java |  5 -----
 .../java/org/linphone/dialer/DialerActivity.java  | 15 +++++++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java
index e2fd861e1..f2948d69b 100644
--- a/app/src/main/java/org/linphone/call/CallActivity.java
+++ b/app/src/main/java/org/linphone/call/CallActivity.java
@@ -564,11 +564,6 @@ public class CallActivity extends LinphoneGenericActivity
         super.onDestroy();
     }
 
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-    }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (mAudioManager.onKeyVolumeAdjust(keyCode)) return true;
diff --git a/app/src/main/java/org/linphone/dialer/DialerActivity.java b/app/src/main/java/org/linphone/dialer/DialerActivity.java
index 56e0999bd..2a60f7297 100644
--- a/app/src/main/java/org/linphone/dialer/DialerActivity.java
+++ b/app/src/main/java/org/linphone/dialer/DialerActivity.java
@@ -67,6 +67,8 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
         super.onCreate(savedInstanceState);
 
         mInterfaceLoaded = false;
+        mIsTransfer = false;
+
         // Uses the fragment container layout to inflate the dialer view instead of using a fragment
         new AsyncLayoutInflater(this)
                 .inflate(
@@ -122,6 +124,8 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+
+        setIntent(intent);
         handleIntentParams(intent);
     }
 
@@ -207,12 +211,6 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
                     }
                 });
 
-        mIsTransfer = false;
-        if (getIntent() != null) {
-            mIsTransfer = getIntent().getBooleanExtra("Transfer", false);
-            mAddress.setText(getIntent().getStringExtra("SipUri"));
-        }
-
         setUpNumpad(view);
         updateLayout();
         enableVideoPreviewIfTablet(true);
@@ -282,6 +280,11 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
             }
         }
 
+        if (getIntent() != null) {
+            mIsTransfer = getIntent().getBooleanExtra("Transfer", false);
+            mAddress.setText(getIntent().getStringExtra("SipUri"));
+        }
+
         mBackToCall.setVisibility(atLeastOneCall ? View.VISIBLE : View.GONE);
         mAddCall.setVisibility(atLeastOneCall && !mIsTransfer ? View.VISIBLE : View.GONE);
         mTransferCall.setVisibility(atLeastOneCall && mIsTransfer ? View.VISIBLE : View.GONE);