Bump version to 7.60.4

app/build.gradle.kts

@@ -23,8 +23,8 @@ plugins {
 apply(from = "static-ips.gradle.kts")
 
 val canonicalVersionCode = 1599
-val canonicalVersionName = "7.60.2"
-val currentHotfixVersion = 0
+val canonicalVersionName = "7.60.4"
+val currentHotfixVersion = 2
 val maxHotfixVersions = 100
 
 val keystores: Map<String, Properties?> = mapOf("debug" to loadKeystoreProperties("keystore.debug.properties"))

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt

@@ -147,7 +147,6 @@ import org.thoughtcrime.securesms.database.helpers.migration.V289_AddQuoteTarget
 import org.thoughtcrime.securesms.database.helpers.migration.V290_AddArchiveThumbnailTransferStateColumn
 import org.thoughtcrime.securesms.database.helpers.migration.V291_NullOutRemoteKeyIfEmpty
 import org.thoughtcrime.securesms.database.helpers.migration.V292_AddPollTables
-import org.thoughtcrime.securesms.database.helpers.migration.V293_LastResortKeyTupleTableMigration
 import org.thoughtcrime.securesms.database.helpers.migration.V294_RemoveLastResortKeyTupleColumnConstraintMigration
 import org.thoughtcrime.securesms.database.helpers.migration.V295_AddLastRestoreKeyTypeTableIfMissingMigration
 import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSqliteDatabase
@@ -303,7 +302,7 @@ object SignalDatabaseMigrations {
     290 to V290_AddArchiveThumbnailTransferStateColumn,
     291 to V291_NullOutRemoteKeyIfEmpty,
     292 to V292_AddPollTables,
-    293 to V293_LastResortKeyTupleTableMigration,
+    // 293 to V293_LastResortKeyTupleTableMigration, - removed due to crashing on some devices.
     294 to V294_RemoveLastResortKeyTupleColumnConstraintMigration,
     295 to V295_AddLastRestoreKeyTypeTableIfMissingMigration
   )

app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V293_LastResortKeyTupleTableMigration.kt

@@ -1,29 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database.helpers.migration
-
-import android.app.Application
-import org.thoughtcrime.securesms.database.SQLiteDatabase
-
-/**
- * Creates the LastResortKeyTuple table.
- */
-@Suppress("ClassName")
-object V293_LastResortKeyTupleTableMigration : SignalDatabaseMigration {
-  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-    db.execSQL(
-      """
-      CREATE TABLE last_resort_key_tuple (
-        _id INTEGER PRIMARY KEY,
-        kyber_prekey_id INTEGER NOT NULL UNIQUE REFERENCES kyber_prekey (_id) ON DELETE CASCADE,
-        signed_key_id INTEGER NOT NULL,
-        public_key BLOB NOT NULL,
-        UNIQUE(kyber_prekey_id, signed_key_id, public_key)
-      )
-      """.trimIndent()
-    )
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V294_RemoveLastResortKeyTupleColumnConstraintMigration.kt

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.SQLiteDatabase
 @Suppress("ClassName")
 object V294_RemoveLastResortKeyTupleColumnConstraintMigration : SignalDatabaseMigration {
   override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-    db.execSQL("DROP TABLE last_resort_key_tuple")
+    db.execSQL("DROP TABLE IF EXISTS last_resort_key_tuple")
 
     db.execSQL(
       """
@@ -25,7 +25,7 @@ object V294_RemoveLastResortKeyTupleColumnConstraintMigration : SignalDatabaseMi
         public_key BLOB NOT NULL,
         UNIQUE(kyber_prekey_id, signed_key_id, public_key)
       )
-      """.trimIndent()
+      """
     )
   }
 }

app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V295_AddLastRestoreKeyTypeTableIfMissingMigration.kt

@@ -23,7 +23,7 @@ object V295_AddLastRestoreKeyTypeTableIfMissingMigration : SignalDatabaseMigrati
         public_key BLOB NOT NULL,
         UNIQUE(kyber_prekey_id, signed_key_id, public_key)
       )
-      """.trimIndent()
+      """
     )
   }
 }