make recreation of views atomic operation

2018-07-12 17:38:10 +02:00
parent 00caf28ee2
commit 4f4be8ed47
1 changed files with 9 additions and 3 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
@@ -363,9 +363,15 @@ public class KeychainDatabase {
    }

    private void recreateUnifiedKeyView(SupportSQLiteDatabase db) {
-        // noinspection deprecation
-        db.execSQL("DROP VIEW IF EXISTS " + KeysModel.UNIFIEDKEYVIEW_VIEW_NAME);
-        db.execSQL(KeysModel.UNIFIEDKEYVIEW);
+        try {
+            db.beginTransaction();
+            // noinspection deprecation
+            db.execSQL("DROP VIEW IF EXISTS " + KeysModel.UNIFIEDKEYVIEW_VIEW_NAME);
+            db.execSQL(KeysModel.UNIFIEDKEYVIEW);
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
    }

    private void migrateSecretKeysFromDbToLocalStorage(SupportSQLiteDatabase db, Context context) throws IOException {