From a8d6f5974f4a900c7bfc5ab99a0d48928b2a8878 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 9 Nov 2015 17:38:46 -0800 Subject: [PATCH] Make phone number validity test work for Faroe islands and elsewhere. // FREEBIE --- android/build.gradle | 5 +++++ java/build.gradle | 7 ++++++- .../textsecure/api/util/PhoneNumberFormatter.java | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 7656360c9e..1145f75f22 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -61,6 +61,11 @@ signing { sign configurations.archives } + +def sonatypeRepo = sonatypeRepo != null ? sonatypeRepo : "" +def whisperSonatypeUsername = whisperSonatypeUsername != null ? whisperSonatypeUsername : "" +def whisperSonatypePassword = whisperSonatypePassword != null ? whisperSonatypePassword : "" + uploadArchives { configuration = configurations.archives repositories.mavenDeployer { diff --git a/java/build.gradle b/java/build.gradle index 440fd91fc7..142736eac3 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -14,7 +14,7 @@ repositories { dependencies { compile 'com.google.protobuf:protobuf-java:2.5.0' - compile 'com.googlecode.libphonenumber:libphonenumber:6.1' + compile 'com.googlecode.libphonenumber:libphonenumber:7.1.0' compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0' compile "org.whispersystems:axolotl-java:${axolotl_version}" @@ -35,6 +35,11 @@ signing { sign configurations.archives } + +def sonatypeRepo = sonatypeRepo != null ? sonatypeRepo : "" +def whisperSonatypeUsername = whisperSonatypeUsername != null ? whisperSonatypeUsername : "" +def whisperSonatypePassword = whisperSonatypePassword != null ? whisperSonatypePassword : "" + uploadArchives { configuration = configurations.archives repositories.mavenDeployer { diff --git a/java/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java b/java/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java index 05ecdf145a..75076f44dd 100644 --- a/java/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java +++ b/java/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java @@ -36,7 +36,10 @@ public class PhoneNumberFormatter { private static final String TAG = PhoneNumberFormatter.class.getSimpleName(); public static boolean isValidNumber(String number) { - return number.matches("^\\+[0-9]{10,}"); + return number.matches("^\\+[0-9]{10,}") || + number.matches("^\\+298[0-9]{6}") || + number.matches("^\\+240[0-9]{6}") || + number.matches("^\\+689[0-9]{6}"); } private static String impreciseFormatNumber(String number, String localNumber)