From 7ea8cc6b0a848c4cbfb43ce50828c2be9b1405da Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 16 Sep 2025 09:44:49 -0400
Subject: [PATCH] Fix database migrations post-backup-restore.

---
 .../securesms/database/helpers/SignalDatabaseMigrations.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
index b590f0ceff..380e2b8876 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
@@ -306,7 +306,11 @@ object SignalDatabaseMigrations {
   fun migrate(context: Application, db: SignalSqliteDatabase, oldVersion: Int, newVersion: Int) {
     val initialForeignKeyState = db.areForeignKeyConstraintsEnabled()
 
-    val eligibleMigrations = migrations.filter { (version, _) -> version > oldVersion && version <= newVersion }
+    val eligibleMigrations = if (newVersion < 0) {
+      migrations.filter { (version, _) -> version > oldVersion }
+    } else {
+      migrations.filter { (version, _) -> version > oldVersion && version <= newVersion }
+    }
 
     for (migrationData in eligibleMigrations) {
       val (version, migration) = migrationData