From c0b68ae6e580cac0fb0cfc084b55de3adc71d58b Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 8 Jul 2014 17:39:22 +0200 Subject: [PATCH] Fix defaultProxyConfig when account deleted --- src/org/linphone/LinphonePreferences.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 7af3e910b..00f4f8639 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -615,6 +615,20 @@ public class LinphonePreferences { public boolean isAccountEnabled(int n) { return getProxyConfig(n).registerEnabled(); } + + public void resetDefaultProxyConfig(){ + int count = getLc().getProxyConfigList().length; + for (int i = 0; i < count; i++) { + if (isAccountEnabled(i)) { + getLc().setDefaultProxyConfig(getProxyConfig(i)); + break; + } + } + + if(getLc().getDefaultProxyConfig() == null){ + getLc().setDefaultProxyConfig(getProxyConfig(0)); + } + } public void deleteAccount(int n) { final LinphoneAuthInfo authInfo = getAuthInfo(n); @@ -638,6 +652,7 @@ public class LinphonePreferences { // TODO: remove once issue http://bugs.linphone.org/view.php?id=984 will be fixed LinphoneActivity.instance().getStatusFragment().registrationStateChanged(RegistrationState.RegistrationNone); } else { + resetDefaultProxyConfig(); getLc().refreshRegisters(); } }