Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 04:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore non-existing recipients in notification profiles storage sync.

Browse Source
This commit is contained in:
Michelle Tang
2025-06-09 14:59:28 -04:00
parent e147d4762d
commit 59cc8c636d
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.kt
View File

@@ -467,18 +467,23 @@ object StorageSyncModels {
private fun localToRemoteRecipients(recipientIds: List<RecipientId>): List<RemoteRecipient> {
return recipientIds.mapNotNull { id ->
val recipient = SignalDatabase.recipients.getRecordForSync(id) ?: throw AssertionError("Missing recipient for id")
when (recipient.recipientType) {
RecipientType.INDIVIDUAL -> {
RemoteRecipient(contact = RemoteRecipient.Contact(serviceId = recipient.serviceId?.toString() ?: "", e164 = recipient.e164 ?: ""))
val recipient = SignalDatabase.recipients.getRecordForSync(id)
if (recipient == null) {
Log.w(TAG, "Recipient $id from notification profile cannot be found")
null
} else {
when (recipient.recipientType) {
RecipientType.INDIVIDUAL -> {
RemoteRecipient(contact = RemoteRecipient.Contact(serviceId = recipient.serviceId?.toString() ?: "", e164 = recipient.e164 ?: ""))
}
RecipientType.GV1 -> {
RemoteRecipient(legacyGroupId = recipient.groupId!!.requireV1().decodedId.toByteString())
}
RecipientType.GV2 -> {
RemoteRecipient(groupMasterKey = recipient.syncExtras.groupMasterKey!!.serialize().toByteString())
}
else -> null
}
RecipientType.GV1 -> {
RemoteRecipient(legacyGroupId = recipient.groupId!!.requireV1().decodedId.toByteString())
}
RecipientType.GV2 -> {
RemoteRecipient(groupMasterKey = recipient.syncExtras.groupMasterKey!!.serialize().toByteString())
}
else -> null
}
}
}