From 71dfd2a0f2c07adcc455fbaff61a9ba2d88abf92 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Fri, 8 Nov 2013 16:35:47 +0100
Subject: [PATCH] Fix settings when trying to remove proxy from proxyconfig

---
 src/org/linphone/AccountPreferencesFragment.java | 2 +-
 src/org/linphone/LinphonePreferences.java        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index 84e5e7d0a..72b3aa5a0 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -92,7 +92,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 		@Override
 		public boolean onPreferenceChange(Preference preference, Object newValue) {
 			mPrefs.setAccountProxy(n, newValue.toString());
-			preference.setSummary(newValue.toString());
+			preference.setSummary(mPrefs.getAccountProxy(n));
 			return true;
 		}		
 	};
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index f5a441687..c8082cc3c 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -272,9 +272,13 @@ public class LinphonePreferences {
 	}
 
 	public void setAccountProxy(int n, String proxy) {
+		if (proxy == null || proxy.length() <= 0) {
+			proxy = getAccountDomain(n);
+		}
 		if (!proxy.startsWith("sip:")) {
 			proxy = "sip:" + proxy;
 		}
+		
 		try {
 			LinphoneProxyConfig prxCfg = getProxyConfig(n);
 			prxCfg.setProxy(proxy);