From 66f49a3ab6f9ea4b754ebb39d9c5fedb025783cd Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 19 Nov 2012 14:12:46 +0100 Subject: [PATCH] Fix account not removed issue --- src/org/linphone/LinphoneManager.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index b22804c80..75b457c19 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -565,12 +565,13 @@ public final class LinphoneManager implements LinphoneCoreListener { } public void initAccounts() throws LinphoneCoreException { - boolean cleanBefore = true; + mLc.clearAuthInfos(); + mLc.clearProxyConfigs(); + for (int i = 0; i < getPrefExtraAccountsNumber(); i++) { String key = i == 0 ? "" : String.valueOf(i); if (!getPrefBoolean(getString(R.string.pref_disable_account_key) + key, false)) { - initAccount(key, cleanBefore, i == getPrefInt(R.string.pref_default_account_key, 0)); - cleanBefore = false; + initAccount(key, i == getPrefInt(R.string.pref_default_account_key, 0)); } } @@ -587,12 +588,7 @@ public final class LinphoneManager implements LinphoneCoreListener { } } - private void initAccount(String key, boolean cleanBefore, boolean defaultAccount) throws LinphoneCoreException { - if (cleanBefore) { - mLc.clearAuthInfos(); - mLc.clearProxyConfigs(); - } - + private void initAccount(String key, boolean defaultAccount) throws LinphoneCoreException { String username = getPrefString(getString(R.string.pref_username_key) + key, null); String password = getPrefString(getString(R.string.pref_passwd_key) + key, null); String domain = getPrefString(getString(R.string.pref_domain_key) + key, null);