From d879f9d746b0271b53bca3fb606c92b24aae4025 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 24 Mar 2020 15:00:57 +0100
Subject: [PATCH] Fixed link account with phone number feature

---
 .../assistant/PhoneAccountLinkingAssistantActivity.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/org/linphone/assistant/PhoneAccountLinkingAssistantActivity.java b/app/src/main/java/org/linphone/assistant/PhoneAccountLinkingAssistantActivity.java
index c768a346f..851ef0385 100644
--- a/app/src/main/java/org/linphone/assistant/PhoneAccountLinkingAssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/PhoneAccountLinkingAssistantActivity.java
@@ -237,9 +237,18 @@ public class PhoneAccountLinkingAssistantActivity extends AssistantActivity {
         super.onResume();
 
         Core core = LinphoneManager.getCore();
+
+        // Save & restore username & password informations, reload will reset
+        String username = getAccountCreator().getUsername();
+        String ha1 = getAccountCreator().getHa1();
+        String algo = getAccountCreator().getAlgorithm();
         if (core != null) {
             reloadLinphoneAccountCreatorConfig();
         }
+        AccountCreator creator = getAccountCreator();
+        creator.setUsername(username);
+        creator.setHa1(ha1);
+        creator.setAlgorithm(algo);
 
         getAccountCreator().addListener(mListener);