diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt index 8cdc366cfa..e054825cd8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt @@ -162,10 +162,13 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data Log.i(TAG, "Upgrading database: $oldVersion, $newVersion") val startTime = System.currentTimeMillis() + db.setForeignKeyConstraintsEnabled(false) try { // Transactions and version bumps are handled in the migrate method SignalDatabaseMigrations.migrate(context, db, oldVersion, newVersion) } finally { + db.setForeignKeyConstraintsEnabled(true) + // We have to re-begin the transaction for the calling code (see comment at start of method) db.beginTransaction() }