cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make recreation of views atomic operation

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-12 17:38:10 +02:00
parent 00caf28ee2
commit 4f4be8ed47
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
View File

@@ -363,9 +363,15 @@ public class KeychainDatabase {
} }
private void recreateUnifiedKeyView(SupportSQLiteDatabase db) { private void recreateUnifiedKeyView(SupportSQLiteDatabase db) {
// noinspection deprecation try {
db.execSQL("DROP VIEW IF EXISTS " + KeysModel.UNIFIEDKEYVIEW_VIEW_NAME); db.beginTransaction();
db.execSQL(KeysModel.UNIFIEDKEYVIEW); // 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 { private void migrateSecretKeysFromDbToLocalStorage(SupportSQLiteDatabase db, Context context) throws IOException {