Add extra guard during db migration.

Relates to #13183
2026-02-21 02:08:40 +00:00 · 2024-01-02 10:29:03 -05:00
parent 1b9cf631be
commit 820a5bc363
1 changed files with 3 additions and 1 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V166_ThreadAndMessageForeignKeys.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V166_ThreadAndMessageForeignKeys.kt
@@ -66,7 +66,9 @@ object V166_ThreadAndMessageForeignKeys : SignalDatabaseMigration {
        Log.w(TAG, "There were $count threads for RecipientId::$recipientId. Merging.", true)

        val threads: List<ThreadInfo> = getThreadsByRecipientId(db, cursor.requireLong("thread_recipient_id"))
-        mergeThreads(db, threads)
+        if (threads.size > 1) {
+          mergeThreads(db, threads)
+        }
      }
    }
  }