mirrors/Signal-Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-05 01:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some edit messages causing unread threads after restore.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-31 11:32:24 -04:00
committed by Michelle Tang
parent 4bb93c653a
commit ab9c8626c0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ import org.thoughtcrime.securesms.polls.Voter
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.stickers.StickerLocator
import org.thoughtcrime.securesms.util.Environment
import org.thoughtcrime.securesms.util.JsonUtils
import org.thoughtcrime.securesms.util.MessageUtil
import org.whispersystems.signalservice.api.payments.Money
@@ -195,10 +196,13 @@ class ChatItemArchiveImporter(
val originalId = messageId
val latestRevisionId = originalId + chatItem.revisions.size
val sortedRevisions = chatItem.revisions.sortedBy { it.dateSent }.map { it.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId) }
val areAnyRevisionsRead = !Environment.IS_INSTRUMENTATION && ((messageInsert.contentValues.getAsInteger(MessageTable.READ) ?: 0) > 0 || sortedRevisions.any { (it.contentValues.getAsInteger(MessageTable.READ) ?: 0) > 0 })
for (revision in sortedRevisions) {
val revisionNumber = messageId - originalId
if (revisionNumber > 0) {
revision.contentValues.put(MessageTable.ORIGINAL_MESSAGE_ID, originalId)
} else if (areAnyRevisionsRead) {
revision.contentValues.put(MessageTable.READ, 1)
}
revision.contentValues.put(MessageTable.LATEST_REVISION_ID, latestRevisionId)
revision.contentValues.put(MessageTable.REVISION_NUMBER, revisionNumber)