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

Fixes for tunnel settings

Browse source
This commit is contained in:
Sylvain Berfini 2013-11-08 15:53:41 +01:00
parent 5665a1249f
commit d6a77bd794
5 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/raw-sw600dp/linphonerc_default
View file

@ -14,3 +14,8 @@ size=vga
[app] [app]
sharing_server=https://www.linphone.org:444/upload.php sharing_server=https://www.linphone.org:444/upload.php
tunnel=disabled
[tunnel]
host=
port=443

5
res/raw/linphonerc_default
View file

@ -13,3 +13,8 @@ size=qvga
[app] [app]
sharing_server=https://www.linphone.org:444/upload.php sharing_server=https://www.linphone.org:444/upload.php
tunnel=disabled
[tunnel]
host=
port=443

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

@ -492,10 +492,12 @@ public class LinphoneManager implements LinphoneCoreListener {
NetworkInfo info = mConnectivityManager.getActiveNetworkInfo(); NetworkInfo info = mConnectivityManager.getActiveNetworkInfo();
mLc.tunnelCleanServers(); mLc.tunnelCleanServers();
String host = mPrefs.getTunnelHost(); String host = mPrefs.getTunnelHost();
if (host != null) {
int port = mPrefs.getTunnelPort(); int port = mPrefs.getTunnelPort();
mLc.tunnelAddServerAndMirror(host, port, 12345, 500); mLc.tunnelAddServerAndMirror(host, port, 12345, 500);
manageTunnelServer(info); manageTunnelServer(info);
} }
}
private boolean isTunnelNeeded(NetworkInfo info) { private boolean isTunnelNeeded(NetworkInfo info) {
if (info == null) { if (info == null) {

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

@ -769,7 +769,7 @@ public class LinphonePreferences {
// Tunnel settings // Tunnel settings
public String getTunnelMode() { public String getTunnelMode() {
return getConfig().getString("app", "tunnel", getString(R.string.default_tunnel_mode_entry_value)); return getConfig().getString("app", "tunnel", null);
} }
public void setTunnelMode(String mode) { public void setTunnelMode(String mode) {
@ -777,7 +777,7 @@ public class LinphonePreferences {
} }
public String getTunnelHost() { public String getTunnelHost() {
return getConfig().getString("tunnel", "host", getString(R.string.tunnel_host)); return getConfig().getString("tunnel", "host", null);
} }
public void setTunnelHost(String host) { public void setTunnelHost(String host) {

5
src/org/linphone/SettingsFragment.java
View file

@ -229,7 +229,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
private void initTunnelSettings() { private void initTunnelSettings() {
setPreferenceDefaultValueAndSummary(R.string.pref_tunnel_host_key, mPrefs.getTunnelHost()); setPreferenceDefaultValueAndSummary(R.string.pref_tunnel_host_key, mPrefs.getTunnelHost());
setPreferenceDefaultValueAndSummary(R.string.pref_tunnel_port_key, mPrefs.getTunnelHost()); setPreferenceDefaultValueAndSummary(R.string.pref_tunnel_port_key, String.valueOf(mPrefs.getTunnelPort()));
setPreferenceDefaultValueAndSummary(R.string.pref_tunnel_mode_key, mPrefs.getTunnelMode()); setPreferenceDefaultValueAndSummary(R.string.pref_tunnel_mode_key, mPrefs.getTunnelMode());
} }
@ -239,6 +239,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
String host = newValue.toString(); String host = newValue.toString();
mPrefs.setTunnelHost(host); mPrefs.setTunnelHost(host);
preference.setSummary(host);
return true; return true;
} }
}); });
@ -248,6 +249,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
try { try {
int port = Integer.parseInt(newValue.toString()); int port = Integer.parseInt(newValue.toString());
mPrefs.setTunnelPort(port); mPrefs.setTunnelPort(port);
preference.setSummary(String.valueOf(port));
return true; return true;
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
return false; return false;
@ -259,6 +261,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
String mode = newValue.toString(); String mode = newValue.toString();
mPrefs.setTunnelMode(mode); mPrefs.setTunnelMode(mode);
preference.setSummary(mode);
return true; return true;
} }
}); });