From 4b2dceb40b14eff99d338970f2d2621b44cf1c28 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 28 Oct 2013 10:37:47 +0100
Subject: [PATCH] Fix proxy/outbound proxy issue

---
 src/org/linphone/LinphonePreferences.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index b654a430f..7dadaf4f1 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -241,16 +241,23 @@ public class LinphonePreferences {
 	}
 
 	public void setAccountProxy(int n, String proxy) {
+		if (!proxy.startsWith("sip:")) {
+			proxy = "sip:" + proxy;
+		}
 		try {
 			LinphoneProxyConfig prxCfg = getProxyConfig(n);
-			prxCfg.setProxy("sip:" + proxy);
+			prxCfg.setProxy(proxy);
 		} catch (LinphoneCoreException e) {
 			e.printStackTrace();
 		}
 	}
 
 	public String getAccountProxy(int n) {
-		return getProxyConfig(n).getProxy();
+		String proxy = getProxyConfig(n).getProxy();
+		if (proxy != null && proxy.startsWith("sip:")) {
+			proxy = proxy.substring(4);
+		}
+		return proxy;
 	}
 
 	public void setNewAccountOutboundProxyEnabled(boolean enabled) {
@@ -260,7 +267,11 @@ public class LinphonePreferences {
 	public void setAccountOutboundProxyEnabled(int n, boolean enabled) {
 		try {
 			if (enabled) {
-				getProxyConfig(n).setRoute(getAccountProxy(n));
+				String route = getAccountProxy(n);
+				if (!route.startsWith("sip:")) {
+					route = "sip:" + route;
+				}
+				getProxyConfig(n).setRoute(route);
 			} else {
 				getProxyConfig(n).setRoute(null);
 			}