From e25a87696c28e3e73c2178132b524ee5a0ed22c9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 18 Nov 2013 15:59:10 +0100
Subject: [PATCH] Fix proxy preference

---
 src/org/linphone/LinphonePreferences.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 119c1ae1b..122f4d763 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -247,7 +247,6 @@ public class LinphonePreferences {
 
 	public void setAccountDomain(int n, String domain) {
 		String identity = "sip:" + getAccountUsername(n) + "@" + domain;
-		String proxy = "sip:" + domain;
 		
 		try {
 			LinphoneAuthInfo authInfo = getClonedAuthInfo(n);
@@ -256,7 +255,6 @@ public class LinphonePreferences {
 			
 			LinphoneProxyConfig prxCfg = getProxyConfig(n);
 			prxCfg.setIdentity(identity);
-			prxCfg.setProxy(proxy);
 			prxCfg.done();
 		} catch (LinphoneCoreException e) {
 			e.printStackTrace();
@@ -283,6 +281,9 @@ public class LinphonePreferences {
 			LinphoneProxyConfig prxCfg = getProxyConfig(n);
 			prxCfg.setProxy(proxy);
 			prxCfg.done();
+			if (isAccountOutboundProxySet(n)) {
+				setAccountOutboundProxyEnabled(n, true);
+			}
 		} catch (LinphoneCoreException e) {
 			e.printStackTrace();
 		}
@@ -318,13 +319,13 @@ public class LinphonePreferences {
 		}
 	}
 
-	public void setNewAccountContactParameters(String contactParams) {
-		tempContactsParams = contactParams;
-	}
-
 	public boolean isAccountOutboundProxySet(int n) {
 		return getProxyConfig(n).getRoute() != null;
 	}
+
+	public void setNewAccountContactParameters(String contactParams) {
+		tempContactsParams = contactParams;
+	}
 	
 	public String getExpires(int n) {
 		return String.valueOf(getProxyConfig(n).getExpires());