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

Be more liberal with migration addresses.

Browse Source 
Anything alpha is an address as-is.

// FREEBIE.
This commit is contained in:
Moxie Marlinspike 2017-08-01 14:46:38 -07:00
parent a67d0b18ff
commit 8a5c89244a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1286,6 +1286,8 @@ public class DatabaseFactory {
private final String localCountryCode; private final String localCountryCode;
private final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance(); private final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
private final Pattern ALPHA_PATTERN = Pattern.compile("[a-zA-Z]");
public NumberMigrator(String localNumber) { public NumberMigrator(String localNumber) {
try { try {
@ -1298,9 +1300,9 @@ public class DatabaseFactory {
} }
public String migrate(@Nullable String number) { public String migrate(@Nullable String number) {
if (number == null) return "Unknown"; if (number == null) return "Unknown";
if (number.startsWith("__textsecure_group__!")) return number; if (number.startsWith("__textsecure_group__!")) return number;
if (android.util.Patterns.EMAIL_ADDRESS.matcher(number).matches()) return number; if (ALPHA_PATTERN.matcher(number).matches()) return number;
String bareNumber = number.replaceAll("[^0-9+]", ""); String bareNumber = number.replaceAll("[^0-9+]", "");