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

Fix a chat update validation error.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-09-11 11:37:18 -04:00
parent 681234ace3
commit 040881e5a6
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,10 @@ object ExportSkips {
return log(sentTimestamp, "Failed to parse thread merge event.")
}
fun individualChatUpdateInWrongTypeOfChat(sentTimestamp: Long): String {
return log(sentTimestamp, "A chat update that only makes sense for individual chats was found in a different kind of chat.")
}
private fun log(sentTimestamp: Long, message: String): String {
return "[SKIP][$sentTimestamp] $message"
}

20
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
View File

@@ -398,7 +398,7 @@ class ChatItemArchiveExporter(
if (record.latestRevisionId == null) {
builder.revisions = revisionMap.remove(record.id)?.repairRevisions(builder) ?: emptyList()
val chatItem = builder.build().validateChatItem() ?: continue
val chatItem = builder.build().validateChatItem(exportState) ?: continue
buffer += chatItem
} else {
var previousEdits = revisionMap[record.latestRevisionId]
@@ -1513,7 +1513,7 @@ private fun <T> ExecutorService.submitTyped(callable: Callable<T>): Future<T> {
return this.submit(callable)
}
fun ChatItem.validateChatItem(): ChatItem? {
private fun ChatItem.validateChatItem(exportState: ExportState): ChatItem? {
if (this.standardMessage == null &&
this.contactMessage == null &&
this.stickerMessage == null &&
@@ -1527,10 +1527,24 @@ fun ChatItem.validateChatItem(): ChatItem? {
Log.w(TAG, ExportSkips.emptyChatItem(this.dateSent))
return null
}
if (this.updateMessage != null && this.updateMessage.isOnlyForIndividualChats() && exportState.threadIdToRecipientId[this.chatId] !in exportState.contactRecipientIds) {
Log.w(TAG, ExportSkips.individualChatUpdateInWrongTypeOfChat(this.dateSent))
return null
}
return this
}
fun List<ChatItem>.repairRevisions(current: ChatItem.Builder): List<ChatItem> {
private fun ChatUpdateMessage.isOnlyForIndividualChats(): Boolean {
return this.simpleUpdate?.type == SimpleChatUpdate.Type.JOINED_SIGNAL ||
this.simpleUpdate?.type == SimpleChatUpdate.Type.END_SESSION ||
this.simpleUpdate?.type == SimpleChatUpdate.Type.CHAT_SESSION_REFRESH ||
this.simpleUpdate?.type == SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST ||
this.simpleUpdate?.type == SimpleChatUpdate.Type.PAYMENTS_ACTIVATED
}
private fun List<ChatItem>.repairRevisions(current: ChatItem.Builder): List<ChatItem> {
return if (current.standardMessage != null) {
val filtered = this
.filter { it.standardMessage != null }