From 014d896333d0c469b1a90cda35d81cd4027110be Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 12 May 2017 16:44:14 +0200
Subject: [PATCH] Fix register fail on delete account

---
 .../org/linphone/AccountPreferencesFragment.java       |  4 ++--
 src/android/org/linphone/LinphoneActivity.java         |  8 +-------
 src/android/org/linphone/LinphonePreferences.java      | 10 +++++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/android/org/linphone/AccountPreferencesFragment.java b/src/android/org/linphone/AccountPreferencesFragment.java
index 00be3bc26..3fc824935 100644
--- a/src/android/org/linphone/AccountPreferencesFragment.java
+++ b/src/android/org/linphone/AccountPreferencesFragment.java
@@ -476,9 +476,9 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
     	delete.setEnabled(!isNewAccount);
     	delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 	        public boolean onPreferenceClick(Preference preference) {
-	        	mPrefs.deleteAccount(n);
+	    		mPrefs.deleteAccount(n);
+				LinphoneActivity.instance().displaySettings();
 				LinphoneActivity.instance().refreshAccounts();
-	        	LinphoneActivity.instance().displaySettings();
 	        	return true;
 	        }
         });
diff --git a/src/android/org/linphone/LinphoneActivity.java b/src/android/org/linphone/LinphoneActivity.java
index 36cc41646..c5a90d568 100644
--- a/src/android/org/linphone/LinphoneActivity.java
+++ b/src/android/org/linphone/LinphoneActivity.java
@@ -1590,13 +1590,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 			statusFragment.resetAccountStatus();
 			LinphoneManager.getInstance().subscribeFriendList(false);
 
-			defaultAccount.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					LinphoneActivity.instance().displayAccountSettings(0);
-					openOrCloseSideMenu(false);
-				}
-			});
+			defaultAccount.setOnClickListener(null);
 		} else {
 			address.setText(proxy.getAddress().asStringUriOnly());
 			displayName.setText(LinphoneUtils.getAddressDisplayName(proxy.getAddress()));
diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index e3bc5c336..6348374d3 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -783,11 +783,6 @@ public class LinphonePreferences {
 	}
 
 	public void deleteAccount(int n) {
-		LinphoneAuthInfo authInfo = getAuthInfo(n);
-		if (authInfo != null) {
-			getLc().removeAuthInfo(authInfo);
-		}
-
 		LinphoneProxyConfig proxyCfg = getProxyConfig(n);
 		if (proxyCfg != null)
 			getLc().removeProxyConfig(proxyCfg);
@@ -797,6 +792,11 @@ public class LinphonePreferences {
 			getLc().setDefaultProxyConfig(null);
 		}
 
+		LinphoneAuthInfo authInfo = getAuthInfo(n);
+		if (authInfo != null) {
+			getLc().removeAuthInfo(authInfo);
+		}
+
 		getLc().refreshRegisters();
 	}
 	// End of accounts settings