From 7fc9876b1ea88ff1893ef627d1ecf0d2c2913508 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 13 Apr 2022 13:06:47 -0400 Subject: [PATCH] Start transaction earlier in backup restore. Fixes #12159 --- .../thoughtcrime/securesms/backup/FullBackupImporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java index 6e8b5236d..09fe1c2f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -97,12 +97,12 @@ public class FullBackupImporter extends FullBackupBase { int count = 0; SQLiteDatabase keyValueDatabase = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).getSqlCipherDatabase(); + + db.beginTransaction(); + keyValueDatabase.beginTransaction(); try { BackupRecordInputStream inputStream = new BackupRecordInputStream(is, passphrase); - db.beginTransaction(); - keyValueDatabase.beginTransaction(); - dropAllTables(db); BackupFrame frame;