TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-19 20:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch regexp matcher to find() in order to handle alpha addresses

Browse Source 
Any address with an alpha character anywhere in it should be used
as-is.

Fixes #6849

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-08-03 09:24:08 -07:00
parent dc61c67856
commit 9a78615991
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/database/Address.java
View File

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

2
src/org/thoughtcrime/securesms/database/DatabaseFactory.java
View File

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