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

Use vga as default video size for tablets + fix for proxy config settings

Browse source
This commit is contained in:
Sylvain Berfini 2013-10-30 17:19:49 +01:00
parent 0c9c75af60
commit 485ae02ee1
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/raw-sw600dp/linphonerc_default
View file

@ -10,7 +10,7 @@ use_ipv6=0
keepalive_period=30000 keepalive_period=30000
[video] [video]
size=qvga size=vga
[app] [app]
sharing_server=https://www.linphone.org:444/upload.php sharing_server=https://www.linphone.org:444/upload.php

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

@ -86,16 +86,12 @@ public class LinphonePreferences {
} }
public String getRingtone(String defaultRingtone) { public String getRingtone(String defaultRingtone) {
String ringtone = getLc().getRing(); String ringtone = getConfig().getString("app", "ringtone", defaultRingtone);
if (ringtone == null || ringtone.length() == 0) if (ringtone == null || ringtone.length() == 0)
ringtone = defaultRingtone; ringtone = defaultRingtone;
return ringtone; return ringtone;
} }
public void setRingtone(String ringtone) {
getLc().setRing(ringtone);
}
public boolean shouldAutomaticallyAcceptFriendsRequests() { public boolean shouldAutomaticallyAcceptFriendsRequests() {
return false; //TODO return false; //TODO
} }
@ -177,7 +173,15 @@ public class LinphonePreferences {
} }
public void setAccountUsername(int n, String username) { public void setAccountUsername(int n, String username) {
String identity = "sip:" + username + "@" + getAccountDomain(n);
try {
LinphoneProxyConfig prxCfg = getProxyConfig(n);
prxCfg.setIdentity(identity);
prxCfg.done();
getAuthInfo(n).setUsername(username); getAuthInfo(n).setUsername(username);
} catch (LinphoneCoreException e) {
e.printStackTrace();
}
} }
public String getAccountUsername(int n) { public String getAccountUsername(int n) {
@ -223,6 +227,7 @@ public class LinphonePreferences {
LinphoneProxyConfig prxCfg = getProxyConfig(n); LinphoneProxyConfig prxCfg = getProxyConfig(n);
prxCfg.setIdentity(identity); prxCfg.setIdentity(identity);
prxCfg.setProxy(proxy); prxCfg.setProxy(proxy);
prxCfg.done();
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -243,6 +248,7 @@ public class LinphonePreferences {
try { try {
LinphoneProxyConfig prxCfg = getProxyConfig(n); LinphoneProxyConfig prxCfg = getProxyConfig(n);
prxCfg.setProxy(proxy); prxCfg.setProxy(proxy);
prxCfg.done();
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -262,15 +268,17 @@ public class LinphonePreferences {
public void setAccountOutboundProxyEnabled(int n, boolean enabled) { public void setAccountOutboundProxyEnabled(int n, boolean enabled) {
try { try {
LinphoneProxyConfig prxCfg = getProxyConfig(n);
if (enabled) { if (enabled) {
String route = getAccountProxy(n); String route = prxCfg.getProxy();
if (!route.startsWith("sip:")) { if (!route.startsWith("sip:")) {
route = "sip:" + route; route = "sip:" + route;
} }
getProxyConfig(n).setRoute(route); prxCfg.setRoute(route);
} else { } else {
getProxyConfig(n).setRoute(null); prxCfg.setRoute(null);
} }
prxCfg.done();
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
e.printStackTrace(); e.printStackTrace();
} }