From ef7c152dc71f4dff2604afd383cf5acfd1681213 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 21 Nov 2012 12:19:48 +0100 Subject: [PATCH] USe same protection for video and audio ports --- src/org/linphone/LinphoneManager.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 4cca998e0..f1f8c5dd0 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -638,8 +638,11 @@ public final class LinphoneManager implements LinphoneCoreListener { private void readAndSetAudioAndVideoPorts() throws NumberFormatException { int aPortStart, aPortEnd, vPortStart, vPortEnd; - aPortStart = aPortEnd = Integer.parseInt(getString(R.string.default_audio_port)); - vPortStart = vPortEnd = Integer.parseInt(getString(R.string.default_video_port)); + int defaultAudioPort, defaultVideoPort; + 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 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]); aPortEnd = Integer.parseInt(audioPort.split("-")[1]); } else { - aPortStart = aPortEnd = Integer.parseInt(audioPort); + try { + aPortStart = aPortEnd = Integer.parseInt(audioPort); + } catch (NumberFormatException nfe) { + aPortStart = aPortEnd = defaultAudioPort; + } } if (videoPort.contains("-")) { @@ -657,7 +664,11 @@ public final class LinphoneManager implements LinphoneCoreListener { vPortStart = Integer.parseInt(videoPort.split("-")[0]); vPortEnd = Integer.parseInt(videoPort.split("-")[1]); } else { - vPortStart = vPortEnd = Integer.parseInt(videoPort); + try { + vPortStart = vPortEnd = Integer.parseInt(videoPort); + } catch (NumberFormatException nfe) { + vPortStart = vPortEnd = defaultVideoPort; + } } if (aPortStart >= aPortEnd) {