Skip to content

Commit dcc533e

Browse files
alex-signalcody-signal
authored andcommitted
Remove body of migration 293.
1 parent cdafe47 commit dcc533e

File tree

3 files changed

+2
-32
lines changed

3 files changed

+2
-32
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ import org.thoughtcrime.securesms.database.helpers.migration.V289_AddQuoteTarget
147147
import org.thoughtcrime.securesms.database.helpers.migration.V290_AddArchiveThumbnailTransferStateColumn
148148
import org.thoughtcrime.securesms.database.helpers.migration.V291_NullOutRemoteKeyIfEmpty
149149
import org.thoughtcrime.securesms.database.helpers.migration.V292_AddPollTables
150-
import org.thoughtcrime.securesms.database.helpers.migration.V293_LastResortKeyTupleTableMigration
151150
import org.thoughtcrime.securesms.database.helpers.migration.V294_RemoveLastResortKeyTupleColumnConstraintMigration
152151
import org.thoughtcrime.securesms.database.helpers.migration.V295_AddLastRestoreKeyTypeTableIfMissingMigration
153152
import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSqliteDatabase
@@ -303,7 +302,7 @@ object SignalDatabaseMigrations {
303302
290 to V290_AddArchiveThumbnailTransferStateColumn,
304303
291 to V291_NullOutRemoteKeyIfEmpty,
305304
292 to V292_AddPollTables,
306-
293 to V293_LastResortKeyTupleTableMigration,
305+
// 293 to V293_LastResortKeyTupleTableMigration, - removed due to crashing on some devices.
307306
294 to V294_RemoveLastResortKeyTupleColumnConstraintMigration,
308307
295 to V295_AddLastRestoreKeyTypeTableIfMissingMigration
309308
)

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.SQLiteDatabase
1414
@Suppress("ClassName")
1515
object V294_RemoveLastResortKeyTupleColumnConstraintMigration : SignalDatabaseMigration {
1616
override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
17-
db.execSQL("DROP TABLE last_resort_key_tuple")
17+
db.execSQL("DROP TABLE IF EXISTS last_resort_key_tuple")
1818

1919
db.execSQL(
2020
"""

0 commit comments

Comments
 (0)