From 3e6c76e27b99f6b7a0ecd68694d344723b3ecbb2 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 11 Jan 2018 15:24:37 +0100
Subject: [PATCH] Fixing problem of listener

---
 .../linphone/assistant/AssistantActivity.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index 131d6675e..669f7f11a 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -99,7 +99,7 @@ private static AssistantActivity instance;
 	private boolean remoteProvisioningInProgress;
 	private boolean echoCancellerAlreadyDone;
 	private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
-	private AccountCreator accountCreator;
+	private AccountCreator mAccountCreator;
 	private CountryListAdapter countryListAdapter;
 
 	public DialPlan country;
@@ -140,8 +140,8 @@ private static AssistantActivity instance;
 		status.enableSideMenu(false);
 
 		if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
-			accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
-			accountCreator.setListener(this);
+			mAccountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
+			mAccountCreator.setListener(this);
 		}
 
 		countryListAdapter = new CountryListAdapter(getApplicationContext());
@@ -229,9 +229,7 @@ private static AssistantActivity instance;
 	}
 
 	private AccountCreator loadAccountCreator(ProxyConfig cfg) {
-		AccountCreator accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
 		ProxyConfig cfgTab[] = LinphoneManager.getLc().getProxyConfigList();
-		accountCreator.setListener(this);
 		int n = -1;
 		for (int i = 0 ; i < cfgTab.length ; i++) {
 			if (cfgTab[i].equals(cfg)) {
@@ -240,10 +238,10 @@ private static AssistantActivity instance;
 			}
 		}
 		if (n >= 0) {
-			accountCreator.setDomain(mPrefs.getAccountDomain(n));
-			accountCreator.setUsername(mPrefs.getAccountUsername(n));
+			mAccountCreator.setDomain(mPrefs.getAccountDomain(n));
+			mAccountCreator.setUsername(mPrefs.getAccountUsername(n));
 		}
-		return accountCreator;
+		return mAccountCreator;
 	}
 
 	private void initUI() {
@@ -713,7 +711,7 @@ private static AssistantActivity instance;
 			isLink = true;
 			displayCreateAccount();
 		}
-
+		if (mAccountCreator != null) mAccountCreator.setListener(null);
 	}
 
 	@Override