From 17e7b1735fdd0babfe96016d31a08c23d7edcc5e Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 27 Oct 2025 11:57:35 -0400 Subject: [PATCH] Fix validation error with chat folder export. --- .../backup/v2/processor/ChatFolderArchiveProcessor.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt index 3ac28902b1..9250f65bb7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt @@ -113,10 +113,10 @@ object ChatFolderArchiveProcessor { private fun ChatFolderRecord.toBackupFrame(includedRecipientIds: List, excludedRecipientIds: List): Frame { val chatFolder = ChatFolderProto( name = this.name, - showOnlyUnread = this.showUnread, - showMutedChats = this.showMutedChats, - includeAllIndividualChats = this.showIndividualChats, - includeAllGroupChats = this.showGroupChats, + showOnlyUnread = this.showUnread && this.folderType != ChatFolderRecord.FolderType.ALL, + showMutedChats = this.showMutedChats || this.folderType == ChatFolderRecord.FolderType.ALL, + includeAllIndividualChats = this.showIndividualChats || this.folderType == ChatFolderRecord.FolderType.ALL, + includeAllGroupChats = this.showGroupChats || this.folderType == ChatFolderRecord.FolderType.ALL, folderType = when (this.folderType) { ChatFolderRecord.FolderType.ALL -> ChatFolderProto.FolderType.ALL ChatFolderRecord.FolderType.CUSTOM -> ChatFolderProto.FolderType.CUSTOM