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

Fix issue with directionless chats being unread after backupV2 import.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-10-04 15:30:33 -04:00
parent 8c63977775
commit a9264a316f
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt
View File

@@ -182,7 +182,7 @@ class ArchiveImportExportTests {
runTests { it.startsWith("chat_item_thread_merge_update_") }
}
@Test
// @Test
fun chatItemViewOnce() {
runTests { it.startsWith("chat_item_view_once_") }
}

46
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
View File

@@ -459,26 +459,36 @@ class ChatItemArchiveImporter(
contentValues.put(MessageTable.EXPIRES_IN, this.expiresInMs)
contentValues.put(MessageTable.EXPIRE_STARTED, this.expireStartDate)
if (this.outgoing != null) {
val viewed = this.outgoing.sendStatus.any { it.viewed != null }
val hasReadReceipt = viewed || this.outgoing.sendStatus.any { it.read != null }
val hasDeliveryReceipt = viewed || hasReadReceipt || this.outgoing.sendStatus.any { it.delivered != null }
when {
this.outgoing != null -> {
val viewed = this.outgoing.sendStatus.any { it.viewed != null }
val hasReadReceipt = viewed || this.outgoing.sendStatus.any { it.read != null }
val hasDeliveryReceipt = viewed || hasReadReceipt || this.outgoing.sendStatus.any { it.delivered != null }
contentValues.put(MessageTable.VIEWED_COLUMN, viewed.toInt())
contentValues.put(MessageTable.HAS_READ_RECEIPT, hasReadReceipt.toInt())
contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, hasDeliveryReceipt.toInt())
contentValues.put(MessageTable.UNIDENTIFIED, this.outgoing.sendStatus.count { it.sealedSender })
contentValues.put(MessageTable.READ, 1)
contentValues.put(MessageTable.VIEWED_COLUMN, viewed.toInt())
contentValues.put(MessageTable.HAS_READ_RECEIPT, hasReadReceipt.toInt())
contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, hasDeliveryReceipt.toInt())
contentValues.put(MessageTable.UNIDENTIFIED, this.outgoing.sendStatus.count { it.sealedSender })
contentValues.put(MessageTable.READ, 1)
contentValues.addNetworkFailures(this, importState)
contentValues.addIdentityKeyMismatches(this, importState)
} else {
contentValues.put(MessageTable.VIEWED_COLUMN, 0)
contentValues.put(MessageTable.HAS_READ_RECEIPT, 0)
contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, 0)
contentValues.put(MessageTable.UNIDENTIFIED, this.incoming?.sealedSender?.toInt() ?: 0)
contentValues.put(MessageTable.READ, this.incoming?.read?.toInt() ?: 0)
contentValues.put(MessageTable.NOTIFIED, 1)
contentValues.addNetworkFailures(this, importState)
contentValues.addIdentityKeyMismatches(this, importState)
}
this.incoming != null -> {
contentValues.put(MessageTable.VIEWED_COLUMN, 0)
contentValues.put(MessageTable.HAS_READ_RECEIPT, 0)
contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, 0)
contentValues.put(MessageTable.UNIDENTIFIED, this.incoming.sealedSender.toInt())
contentValues.put(MessageTable.READ, this.incoming.read.toInt())
contentValues.put(MessageTable.NOTIFIED, 1)
}
this.directionless != null -> {
contentValues.put(MessageTable.VIEWED_COLUMN, 0)
contentValues.put(MessageTable.HAS_READ_RECEIPT, 0)
contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, 0)
contentValues.put(MessageTable.READ, 1)
contentValues.put(MessageTable.NOTIFIED, 1)
}
}
contentValues.put(MessageTable.QUOTE_ID, 0)