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 edit message import data bugs.

Browse Source
This commit is contained in:
Cody Henthorne
2025-08-13 14:13:19 -04:00
committed by Greyson Parrelli
parent 859bb02c86
commit fc1cd6d262
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,6 +132,7 @@ class ChatItemArchiveImporter(
MessageTable.MESSAGE_EXTRAS,
MessageTable.ORIGINAL_MESSAGE_ID,
MessageTable.LATEST_REVISION_ID,
MessageTable.REVISION_NUMBER,
MessageTable.PARENT_STORY_ID,
MessageTable.NOTIFIED
)
@@ -193,14 +194,18 @@ class ChatItemArchiveImporter(
val latestRevisionId = originalId + chatItem.revisions.size
val sortedRevisions = chatItem.revisions.sortedBy { it.dateSent }.map { it.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId) }
for (revision in sortedRevisions) {
revision.contentValues.put(MessageTable.ORIGINAL_MESSAGE_ID, originalId)
val revisionNumber = messageId - originalId
if (revisionNumber > 0) {
revision.contentValues.put(MessageTable.ORIGINAL_MESSAGE_ID, originalId)
}
revision.contentValues.put(MessageTable.LATEST_REVISION_ID, latestRevisionId)
revision.contentValues.put(MessageTable.REVISION_NUMBER, (messageId - originalId))
revision.contentValues.put(MessageTable.REVISION_NUMBER, revisionNumber)
buffer.messages += revision
messageId++
}
messageInsert.contentValues.put(MessageTable.ORIGINAL_MESSAGE_ID, originalId)
messageInsert.contentValues.put(MessageTable.REVISION_NUMBER, (messageId - originalId))
}
buffer.messages += messageInsert
buffer.reactions += chatItem.toReactionContentValues(messageId)