diff --git a/res/raw-sw600dp/linphonerc_default b/res/raw-sw600dp/linphonerc_default index 9b0869a95..26d202792 100644 --- a/res/raw-sw600dp/linphonerc_default +++ b/res/raw-sw600dp/linphonerc_default @@ -10,7 +10,7 @@ use_ipv6=0 keepalive_period=30000 [video] -size=qvga +size=vga [app] sharing_server=https://www.linphone.org:444/upload.php diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 6b78e808b..e53046aeb 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -86,15 +86,11 @@ public class LinphonePreferences { } public String getRingtone(String defaultRingtone) { - String ringtone = getLc().getRing(); + String ringtone = getConfig().getString("app", "ringtone", defaultRingtone); if (ringtone == null || ringtone.length() == 0) ringtone = defaultRingtone; return ringtone; } - - public void setRingtone(String ringtone) { - getLc().setRing(ringtone); - } public boolean shouldAutomaticallyAcceptFriendsRequests() { return false; //TODO @@ -177,7 +173,15 @@ public class LinphonePreferences { } public void setAccountUsername(int n, String username) { - getAuthInfo(n).setUsername(username); + String identity = "sip:" + username + "@" + getAccountDomain(n); + try { + LinphoneProxyConfig prxCfg = getProxyConfig(n); + prxCfg.setIdentity(identity); + prxCfg.done(); + getAuthInfo(n).setUsername(username); + } catch (LinphoneCoreException e) { + e.printStackTrace(); + } } public String getAccountUsername(int n) { @@ -223,6 +227,7 @@ public class LinphonePreferences { LinphoneProxyConfig prxCfg = getProxyConfig(n); prxCfg.setIdentity(identity); prxCfg.setProxy(proxy); + prxCfg.done(); } catch (LinphoneCoreException e) { e.printStackTrace(); } @@ -243,6 +248,7 @@ public class LinphonePreferences { try { LinphoneProxyConfig prxCfg = getProxyConfig(n); prxCfg.setProxy(proxy); + prxCfg.done(); } catch (LinphoneCoreException e) { e.printStackTrace(); } @@ -262,15 +268,17 @@ public class LinphonePreferences { public void setAccountOutboundProxyEnabled(int n, boolean enabled) { try { + LinphoneProxyConfig prxCfg = getProxyConfig(n); if (enabled) { - String route = getAccountProxy(n); + String route = prxCfg.getProxy(); if (!route.startsWith("sip:")) { route = "sip:" + route; } - getProxyConfig(n).setRoute(route); + prxCfg.setRoute(route); } else { - getProxyConfig(n).setRoute(null); + prxCfg.setRoute(null); } + prxCfg.done(); } catch (LinphoneCoreException e) { e.printStackTrace(); }