Fix proxy preference

This commit is contained in:
Sylvain Berfini 2013-11-18 15:59:10 +01:00
parent 129b1e7207
commit e25a87696c

View file

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