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

USe same protection for video and audio ports

Browse source
This commit is contained in:
Sylvain Berfini 2012-11-21 12:19:48 +01:00
parent cde3110e9d
commit ef7c152dc7
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -638,8 +638,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
private void readAndSetAudioAndVideoPorts() throws NumberFormatException { private void readAndSetAudioAndVideoPorts() throws NumberFormatException {
int aPortStart, aPortEnd, vPortStart, vPortEnd; int aPortStart, aPortEnd, vPortStart, vPortEnd;
aPortStart = aPortEnd = Integer.parseInt(getString(R.string.default_audio_port)); int defaultAudioPort, defaultVideoPort;
vPortStart = vPortEnd = Integer.parseInt(getString(R.string.default_video_port)); defaultAudioPort = Integer.parseInt(getString(R.string.default_audio_port));
defaultVideoPort = Integer.parseInt(getString(R.string.default_video_port));
aPortStart = aPortEnd = defaultAudioPort;
vPortStart = vPortEnd = defaultVideoPort;
String audioPort = getPrefString(R.string.pref_audio_port_key, String.valueOf(aPortStart)); String audioPort = getPrefString(R.string.pref_audio_port_key, String.valueOf(aPortStart));
String videoPort = getPrefString(R.string.pref_video_port_key, String.valueOf(vPortStart)); String videoPort = getPrefString(R.string.pref_video_port_key, String.valueOf(vPortStart));
@ -649,7 +652,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
aPortStart = Integer.parseInt(audioPort.split("-")[0]); aPortStart = Integer.parseInt(audioPort.split("-")[0]);
aPortEnd = Integer.parseInt(audioPort.split("-")[1]); aPortEnd = Integer.parseInt(audioPort.split("-")[1]);
} else { } else {
try {
aPortStart = aPortEnd = Integer.parseInt(audioPort); aPortStart = aPortEnd = Integer.parseInt(audioPort);
} catch (NumberFormatException nfe) {
aPortStart = aPortEnd = defaultAudioPort;
}
} }
if (videoPort.contains("-")) { if (videoPort.contains("-")) {
@ -657,7 +664,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
vPortStart = Integer.parseInt(videoPort.split("-")[0]); vPortStart = Integer.parseInt(videoPort.split("-")[0]);
vPortEnd = Integer.parseInt(videoPort.split("-")[1]); vPortEnd = Integer.parseInt(videoPort.split("-")[1]);
} else { } else {
try {
vPortStart = vPortEnd = Integer.parseInt(videoPort); vPortStart = vPortEnd = Integer.parseInt(videoPort);
} catch (NumberFormatException nfe) {
vPortStart = vPortEnd = defaultVideoPort;
}
} }
if (aPortStart >= aPortEnd) { if (aPortStart >= aPortEnd) {