Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'newUI' into channels

Browse source
This commit is contained in:
Ghislain MARY 2012-08-28 09:54:51 +02:00
commit 2fea4b57bf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/org/linphone/LinphoneManager.java
View file

@ -617,19 +617,19 @@ public final class LinphoneManager implements LinphoneCoreListener {
if (!proxy.startsWith("sip:")) { if (!proxy.startsWith("sip:")) {
proxy = "sip:" + proxy; proxy = "sip:" + proxy;
} }
LinphoneProxyConfig defaultProxyConfig = LinphoneCoreFactory.instance().createProxyConfig(identity, proxy, null, true); LinphoneProxyConfig proxycon = LinphoneCoreFactory.instance().createProxyConfig(identity, proxy, null, true);
mLc.addProxyConfig(defaultProxyConfig); mLc.addProxyConfig(proxycon);
//outbound proxy //outbound proxy
if (getPrefBoolean(getString(R.string.pref_enable_outbound_proxy_key) + key, false)) { if (getPrefBoolean(getString(R.string.pref_enable_outbound_proxy_key) + key, false)) {
defaultProxyConfig.setRoute(proxy); proxycon.setRoute(proxy);
} else { } else {
defaultProxyConfig.setRoute(null); proxycon.setRoute(null);
} }
defaultProxyConfig.done(); proxycon.done();
if (defaultAccount) { if (defaultAccount) {
mLc.setDefaultProxyConfig(defaultProxyConfig); mLc.setDefaultProxyConfig(proxycon);
} }
} }
} }