Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address possible invalid e164's in storage service splits.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-04-21 13:36:48 -04:00
committed by Cody Henthorne
parent 8c5811581e
commit ec6448bd1b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
View File

@@ -2370,7 +2370,10 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
val recipientId = getByAci(aci).getOrNull() ?: return val recipientId = getByAci(aci).getOrNull() ?: return
val record = getRecord(recipientId) val record = getRecord(recipientId)
if (record.pni == null && record.e164 == null) { val pni = record.pni
val e164 = record.e164?.takeIf { SignalE164Util.isPotentialE164(it) }
if (pni == null && e164 == null) {
return return
} }
@@ -2385,7 +2388,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
.where("$ID = ?", record.id) .where("$ID = ?", record.id)
.run() .run()
getAndPossiblyMerge(null, record.pni, record.e164) getAndPossiblyMerge(null, pni, e164)
} }
fun processIndividualCdsLookup(aci: ACI?, pni: PNI, e164: String): RecipientId { fun processIndividualCdsLookup(aci: ACI?, pni: PNI, e164: String): RecipientId {