From 9a78615991dd9e873307b7d683ea67758026d1ea Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 3 Aug 2017 09:24:08 -0700 Subject: [PATCH] Switch regexp matcher to find() in order to handle alpha addresses Any address with an alpha character anywhere in it should be used as-is. Fixes #6849 // FREEBIE --- src/org/thoughtcrime/securesms/database/Address.java | 2 +- src/org/thoughtcrime/securesms/database/DatabaseFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java index 15fe20a4b2..6104c9e5ba 100644 --- a/src/org/thoughtcrime/securesms/database/Address.java +++ b/src/org/thoughtcrime/securesms/database/Address.java @@ -206,7 +206,7 @@ public class Address implements Parcelable, Comparable
{ public String format(@Nullable String number) { if (number == null) return "Unknown"; if (number.startsWith("__textsecure_group__!")) return number; - if (ALPHA_PATTERN.matcher(number).matches()) return number.trim(); + if (ALPHA_PATTERN.matcher(number).find()) return number.trim(); String bareNumber = number.replaceAll("[^0-9+]", ""); diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java index 571ac70d04..e42fb2f2c9 100644 --- a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java +++ b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java @@ -1319,7 +1319,7 @@ public class DatabaseFactory { public String migrate(@Nullable String number) { if (number == null) return "Unknown"; if (number.startsWith("__textsecure_group__!")) return number; - if (ALPHA_PATTERN.matcher(number).matches()) return number; + if (ALPHA_PATTERN.matcher(number).find()) return number.trim(); String bareNumber = number.replaceAll("[^0-9+]", "");