From 390a03b78334ba87a613ff150abff74f2e0056e6 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 26 Mar 2025 09:08:33 -0400
Subject: [PATCH] Fix query for thread merge fallback.

---
 .../java/org/thoughtcrime/securesms/database/MessageTable.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index 1c8461b51d..41efeab471 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -4953,7 +4953,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
               SELECT 1 FROM $TABLE_NAME AS m2
               WHERE m1.$FROM_RECIPIENT_ID = m2.$FROM_RECIPIENT_ID
               AND m1.$DATE_SENT = m2.$DATE_SENT
-              AN m1.$THREAD_ID != m2.$THREAD_ID
+              AND m1.$THREAD_ID != m2.$THREAD_ID
               AND m1.$ID > m2.$ID
             )
           )