Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Potentially fix e164 crash.

Browse Source
This commit is contained in:
Michelle Tang
2025-12-18 09:52:12 -05:00
committed by jeffrey-signal
parent ee930f59db
commit 3a91bb8947
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
View File

@@ -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)