From 8a5c89244a4465361607b3a6aee0d54ce54a1f53 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Tue, 1 Aug 2017 14:46:38 -0700 Subject: [PATCH] Be more liberal with migration addresses. Anything alpha is an address as-is. // FREEBIE. --- .../thoughtcrime/securesms/database/DatabaseFactory.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java index 79d0bbb748..fa1770f89f 100644 --- a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java +++ b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java @@ -1286,6 +1286,8 @@ public class DatabaseFactory { private final String localCountryCode; private final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance(); + private final Pattern ALPHA_PATTERN = Pattern.compile("[a-zA-Z]"); + public NumberMigrator(String localNumber) { try { @@ -1298,9 +1300,9 @@ public class DatabaseFactory { } public String migrate(@Nullable String number) { - if (number == null) return "Unknown"; - if (number.startsWith("__textsecure_group__!")) return number; - if (android.util.Patterns.EMAIL_ADDRESS.matcher(number).matches()) return number; + if (number == null) return "Unknown"; + if (number.startsWith("__textsecure_group__!")) return number; + if (ALPHA_PATTERN.matcher(number).matches()) return number; String bareNumber = number.replaceAll("[^0-9+]", "");