From 4dede65e32478ef5326218525d2c3d7e91939144 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 9 Jan 2026 16:54:42 -0500
Subject: [PATCH] Remove some bad thumbnails from archive reconciliation.

---
 .../org/thoughtcrime/securesms/database/AttachmentTable.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
index 5784223dfa..c74a6e2a70 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -3470,12 +3470,14 @@ class AttachmentTable(
           val plaintextHash = Base64.decode(cursor.requireNonNullString(DATA_HASH_END))
           val mediaId = MediaName.fromPlaintextHashAndRemoteKey(plaintextHash, remoteKey).toMediaId(SignalStore.backup.mediaRootBackupKey).value.toByteString()
           val mediaIdThumbnail = MediaName.fromPlaintextHashAndRemoteKeyForThumbnail(plaintextHash, remoteKey).toMediaId(SignalStore.backup.mediaRootBackupKey).value.toByteString()
+          val isQuote = cursor.requireBoolean(QUOTE)
+          val messageId = cursor.requireLong(MESSAGE_ID)
 
           if (mediaId in byteStringMediaIds) {
             found.add(getAttachment(cursor) to false)
           }
 
-          if (mediaIdThumbnail in byteStringMediaIds) {
+          if (mediaIdThumbnail in byteStringMediaIds && !isQuote && messageId != WALLPAPER_MESSAGE_ID) {
             found.add(getAttachment(cursor) to true)
           }
 
@@ -3516,7 +3518,7 @@ class AttachmentTable(
         .readToSingleLong(0)
     }
 
-    val uniqueEligibleMediaNamesWithThumbnailsCount = readableDatabase.query("SELECT COUNT(*) FROM (SELECT DISTINCT $DATA_HASH_END, $REMOTE_KEY FROM $TABLE_NAME WHERE $DATA_HASH_END NOT NULL AND $REMOTE_KEY NOT NULL AND $THUMBNAIL_FILE NOT NULL)").readToSingleLong(-1L)
+    val uniqueEligibleMediaNamesWithThumbnailsCount = readableDatabase.query("SELECT COUNT(*) FROM (SELECT DISTINCT $DATA_HASH_END, $REMOTE_KEY FROM $TABLE_NAME WHERE $DATA_HASH_END NOT NULL AND $REMOTE_KEY NOT NULL AND $THUMBNAIL_FILE NOT NULL AND $QUOTE = 0 AND $MESSAGE_ID != $WALLPAPER_MESSAGE_ID)").readToSingleLong(-1L)
     val archiveStatusMediaNameThumbnailCounts: Map<ArchiveTransferState, Long> = ArchiveTransferState.entries.associateWith { state ->
       readableDatabase.query(
         """