Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible crash when splitting contacts with invalid e164s.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-12-17 14:28:34 -05:00
committed by jeffrey-signal
parent b7d671dcbd
commit 951d073ad6
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2390,6 +2390,16 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
AppDependencies.databaseObserver.notifyRecipientChanged(id)
}
if (record.e164 == null) {
Log.w(TAG, "[WithSplit] Missing e164! Not adding the PNI/E164 record.")
return
}
if (!SignalE164Util.isPotentialE164(record.e164)) {
Log.w(TAG, "[WithSplit] Invalid e164! Not adding the PNI/E164 record.")
return
}
val splitId = getAndPossiblyMerge(null, record.pni, record.e164)
Log.i(TAG, "Split off new recipient as $splitId (ACI-only recipient is $id)")
}