From 8e020c05f63163e9f2ca276c821151e74bd42f1b Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 3 Sep 2021 09:15:08 -0400
Subject: [PATCH] Improve IdentityDatabase e164 check.

---
 .../thoughtcrime/securesms/database/IdentityDatabase.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
index 14e338539..d8467e2be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
@@ -108,7 +108,7 @@ public class IdentityDatabase extends Database {
                                        firstUse,
                                        timestamp,
                                        nonblockingApproval);
-      } else if (addressName.charAt(0) != '+') {
+      } else if (!fastIsE164(addressName)) {
         if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(addressName)) {
           Recipient recipient = Recipient.external(context, addressName);
 
@@ -269,4 +269,8 @@ public class IdentityDatabase extends Database {
 
     EventBus.getDefault().post(new IdentityRecord(recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval));
   }
+
+  private boolean fastIsE164(@NonNull String value) {
+    return value.charAt(0) == '+' || value.length() <= 15;
+  }
 }