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

Fix chat folder crash on missing GV2 key.

Browse Source
This commit is contained in:
Michelle Tang
2026-08-26 15:22:20 -04:00
parent 984a98d181
commit 9265229d2e
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.kt
+15 -3
View File
@@ -507,7 +507,7 @@ object StorageSyncModels {
return recipientIds.mapNotNull { id ->
val recipient = SignalDatabase.recipients.getRecordForSync(id)
if (recipient == null) {
Log.w(TAG, "Recipient $id from notification profile cannot be found")
Log.w(TAG, "Recipient $id cannot be found")
null
} else {
when (recipient.recipientType) {
@@ -521,10 +521,22 @@ object StorageSyncModels {
)
}
RecipientType.GV1 -> {
RemoteRecipient(legacyGroupId = recipient.groupId!!.requireV1().decodedId.toByteString())
val groupId = recipient.groupId
if (groupId == null || !groupId.isV1) {
Log.w(TAG, "Recipient $id is a GV1 recipient without a V1 group id. Skipping.")
null
} else {
RemoteRecipient(legacyGroupId = groupId.requireV1().decodedId.toByteString())
}
}
RecipientType.GV2 -> {
RemoteRecipient(groupMasterKey = recipient.syncExtras.groupMasterKey!!.serialize().toByteString())
val masterKey = recipient.syncExtras.groupMasterKey
if (masterKey == null) {
Log.w(TAG, "Recipient $id is a GV2 recipient without a master key. Skipping.")
null
} else {
RemoteRecipient(groupMasterKey = masterKey.serialize().toByteString())
}
}
else -> null
}