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

Fix sip port and random port

Browse source
This commit is contained in:
Sylvain Berfini 2013-10-14 16:02:05 +02:00
parent 18bd5b0185
commit 5c898ca323
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/raw-sw600dp/linphonerc_default
View file

@ -4,7 +4,6 @@ upload_bw=512
firewall_policy=0 firewall_policy=0
[sip] [sip]
sip_random_port=1
contact=sip:unknown@unknown-host contact=sip:unknown@unknown-host
use_info=0 use_info=0
use_ipv6=0 use_ipv6=0

1
res/raw/linphonerc_default
View file

@ -3,7 +3,6 @@ download_bw=380
upload_bw=380 upload_bw=380
[sip] [sip]
sip_random_port=1
contact=sip:unknown@unknown-host contact=sip:unknown@unknown-host
use_info=0 use_info=0
use_ipv6=0 use_ipv6=0

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

@ -36,6 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* @author Sylvain Berfini * @author Sylvain Berfini
*/ */
public class LinphonePreferences { public class LinphonePreferences {
private static final int LINPHONE_CORE_RANDOM_PORT = -1;
private static LinphonePreferences instance; private static LinphonePreferences instance;
private Context mContext; private Context mContext;
@ -403,11 +404,19 @@ public class LinphonePreferences {
} }
public void useRandomPort(boolean enabled) { public void useRandomPort(boolean enabled) {
getConfig().setBool("sip", "sip_random_port", enabled); //FIXME getConfig().setBool("app", "random_port", enabled);
if (enabled) {
setSipPort(LINPHONE_CORE_RANDOM_PORT);
} else {
if (getTransport().equals(getString(R.string.pref_transport_tls)))
setSipPort(5061);
else
setSipPort(5060);
}
} }
public boolean isUsingRandomPort() { public boolean isUsingRandomPort() {
return getConfig().getBool("sip", "sip_random_port", true); //FIXME return getConfig().getBool("app", "random_port", true);
} }
public String getSipPort() { public String getSipPort() {
@ -423,9 +432,6 @@ public class LinphonePreferences {
} }
public void setSipPort(int port) { public void setSipPort(int port) {
if (port <= 0)
return;
Transports transports = getLc().getSignalingTransportPorts(); Transports transports = getLc().getSignalingTransportPorts();
if (transports.udp > 0) if (transports.udp > 0)
transports.udp = port; transports.udp = port;

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

@ -466,7 +466,12 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
findPreference(getString(R.string.pref_sip_port_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { findPreference(getString(R.string.pref_sip_port_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
mPrefs.setSipPort((Integer) newValue); int port = -1;
try {
port = Integer.parseInt(newValue.toString());
} catch (NumberFormatException nfe) { }
mPrefs.setSipPort(port);
preference.setSummary(newValue.toString()); preference.setSummary(newValue.toString());
return true; return true;
} }