From 3a91bb8947c703240b2e668493d056b55b4b6cdc Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Thu, 18 Dec 2025 09:52:12 -0500
Subject: [PATCH] Potentially fix e164 crash.

---
 .../java/org/thoughtcrime/securesms/recipients/Recipient.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
index e228e6dabf..578a87a7f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
@@ -45,6 +45,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.phonenumbers.NumberUtil
 import org.thoughtcrime.securesms.profiles.ProfileName
+import org.thoughtcrime.securesms.recipients.Recipient.Companion.external
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.util.SignalE164Util
 import org.thoughtcrime.securesms.util.UsernameUtil.isValidUsernameForSearch
@@ -1071,9 +1072,10 @@ class Recipient(
         SignalDatabase.recipients.getOrInsertFromEmail(identifier)
       } else if (isValidUsernameForSearch(identifier)) {
         throw IllegalArgumentException("Creating a recipient based on username alone is not supported!")
+      } else if (SignalE164Util.isPotentialE164(identifier)) {
+        SignalDatabase.recipients.getOrInsertFromE164(identifier)
       } else {
-        val e164: String = SignalE164Util.formatAsE164(identifier) ?: return null
-        SignalDatabase.recipients.getOrInsertFromE164(e164)
+        return null
       }
 
       return resolved(id)