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

Fix missing UUID crash in storage service.

Browse Source
This commit is contained in:
Michelle Tang
2026-01-13 12:19:38 -05:00
parent 1b250300c7
commit 2e4665e5c4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1220,7 +1220,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
val out: MutableMap<RecipientId, StorageId> = HashMap()
readableDatabase
.select(ID, STORAGE_SERVICE_ID, TYPE)
.select(ID, STORAGE_SERVICE_ID, TYPE, ACI_COLUMN, PNI_COLUMN)
.from(TABLE_NAME)
.where(
"""
@@ -1251,7 +1251,15 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
val key = Base64.decodeOrThrow(encodedKey)
when (recipientType) {
RecipientType.INDIVIDUAL -> out[id] = StorageId.forContact(key)
RecipientType.INDIVIDUAL -> {
val aci = ACI.parseOrNull(cursor.requireString(ACI_COLUMN))
val pni = PNI.parseOrNull(cursor.requireString(PNI_COLUMN))
if (aci == null && pni == null) {
Log.w(TAG, "All identifiers are null! Skipping. Before parsing, ACI: ${cursor.requireString(ACI_COLUMN) != null}, PNI: ${cursor.requireString(PNI_COLUMN) != null}")
} else {
out[id] = StorageId.forContact(key)
}
}
RecipientType.GV1 -> out[id] = StorageId.forGroupV1(key)
RecipientType.DISTRIBUTION_LIST -> out[id] = StorageId.forStoryDistributionList(key)
RecipientType.CALL_LINK -> out[id] = StorageId.forCallLink(key)