From 96d6ff2f0cbf3e1850e11fe6bc57b84c3ff927cc Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Fri, 31 Oct 2014 15:57:29 +0100 Subject: [PATCH] Use normalize for checking number address --- src/org/linphone/LinphoneSimpleListener.java | 1 - src/org/linphone/LinphoneUtils.java | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/LinphoneSimpleListener.java b/src/org/linphone/LinphoneSimpleListener.java index d2dbd3cf6..d52e1998c 100644 --- a/src/org/linphone/LinphoneSimpleListener.java +++ b/src/org/linphone/LinphoneSimpleListener.java @@ -21,7 +21,6 @@ package org.linphone; import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneContent; -import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneEvent; import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.LinphoneCall.State; diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java index 912ae105b..95d77b071 100644 --- a/src/org/linphone/LinphoneUtils.java +++ b/src/org/linphone/LinphoneUtils.java @@ -23,7 +23,6 @@ import static android.view.View.VISIBLE; import java.io.BufferedOutputStream; import java.io.BufferedReader; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -43,6 +42,7 @@ import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; +import org.linphone.core.LinphoneProxyConfig; import org.linphone.mediastream.Log; import org.linphone.mediastream.Version; import org.linphone.mediastream.video.capture.hwconf.Hacks; @@ -87,7 +87,11 @@ public final class LinphoneUtils { } public static boolean isNumberAddress(String numberOrAddress) { - return numberOrAddress.matches("[-+]?\\d*\\.?\\d+"); + LinphoneProxyConfig proxy = LinphoneManager.getLc().createProxyConfig(); + if(proxy.normalizePhoneNumber(numberOrAddress) != null){ + return true; + } + return false; } public static boolean isStrictSipAddress(String numberOrAddress) {