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
pull/1/head
Moxie Marlinspike 8 years ago
parent dc61c67856
commit 9a78615991

@ -206,7 +206,7 @@ public class Address implements Parcelable, Comparable<Address> {
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+]", "");

@ -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+]", "");

Loading…
Cancel
Save