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

Fix crashes in new settings API

Browse source
This commit is contained in:
Sylvain Berfini 2013-10-31 16:59:35 +01:00
parent bb62b310d9
commit 675a2ff05d
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/org/linphone/LinphonePreferences.java
View file

@ -116,10 +116,11 @@ public class LinphonePreferences {
} catch (LinphoneCoreException e) { } } catch (LinphoneCoreException e) { }
return null; return null;
} }
else if (n < 0) { else if (n < 0 || n >= authsInfos.length) {
return null; return null;
} }
return authsInfos[n];
return null;
} }
private String tempUsername; private String tempUsername;
@ -174,11 +175,12 @@ public class LinphonePreferences {
public void setAccountUsername(int n, String username) { public void setAccountUsername(int n, String username) {
String identity = "sip:" + username + "@" + getAccountDomain(n); String identity = "sip:" + username + "@" + getAccountDomain(n);
LinphoneAuthInfo info = getAuthInfo(n); // Get the auth info before editing the proxy config to ensure to get the correct auth info
try { try {
LinphoneProxyConfig prxCfg = getProxyConfig(n); LinphoneProxyConfig prxCfg = getProxyConfig(n);
prxCfg.setIdentity(identity); prxCfg.setIdentity(identity);
prxCfg.done(); prxCfg.done();
getAuthInfo(n).setUsername(username); info.setUsername(username);
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -574,6 +576,15 @@ public class LinphonePreferences {
getLc().setSignalingTransportPorts(transports); getLc().setSignalingTransportPorts(transports);
} }
public String getTransportKey() {
Transports transports = getLc().getSignalingTransportPorts();
String transport = getString(R.string.pref_transport_udp_key);
if (transports.tcp > 0)
transport = getString(R.string.pref_transport_tcp_key);
else if (transports.tls > 0)
transport = getString(R.string.pref_transport_tls_key);
return transport;
}
public String getTransport() { public String getTransport() {
Transports transports = getLc().getSignalingTransportPorts(); Transports transports = getLc().getSignalingTransportPorts();