From 7e8c6228d8cbe26c677f1d4d14abcab9158bfe91 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 8 Jun 2026 16:07:19 +0000
Subject: [PATCH] Improve CDN mismatch reconciliation query.

---
 .../securesms/database/BackupMediaSnapshotTable.kt        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt
index b1b0a68a00..a2a7ba4448 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt
@@ -288,15 +288,17 @@ class BackupMediaSnapshotTable(context: Context, database: SignalDatabase) : Dat
       return emptyList()
     }
 
-    val inputValues = objects.joinToString(separator = ", ") { "('${it.mediaId}', ${it.cdn})" }
+    val placeholders = objects.joinToString(separator = ", ") { "(?, ?)" }
+    val args: Array<Any> = objects.flatMap { listOf(it.mediaId, it.cdn) }.toTypedArray()
     return readableDatabase.rawQuery(
       """
-      WITH input_pairs($MEDIA_ID, $CDN) AS (VALUES $inputValues)
+      WITH input_pairs($MEDIA_ID, $CDN) AS (VALUES $placeholders)
       SELECT a.$PLAINTEXT_HASH, a.$REMOTE_KEY, b.$CDN
       FROM $TABLE_NAME a
       JOIN input_pairs b ON a.$MEDIA_ID = b.$MEDIA_ID
       WHERE a.$CDN != b.$CDN AND a.$IS_THUMBNAIL = 0 AND $SNAPSHOT_VERSION = $MAX_VERSION
-      """
+      """,
+      *args
     ).readToList { cursor ->
       CdnMismatchResult(
         plaintextHash = cursor.requireNonNullBlob(PLAINTEXT_HASH),