From 10a0c3e70ba982cd5fd2797da00cfff2f6cba810 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 17 May 2017 12:23:30 +0200 Subject: [PATCH] fix database upgrade --- .../keychain/provider/KeychainDatabase.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java index c1e6f95b3..58266db08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -289,10 +289,6 @@ public class KeychainDatabase extends SQLiteOpenHelper { case 15: db.execSQL("CREATE INDEX uids_by_name ON user_packets (name COLLATE NOCASE)"); db.execSQL("CREATE INDEX uids_by_email ON user_packets (email COLLATE NOCASE)"); - if (oldVersion == 14) { - // no consolidate necessary - return; - } case 16: // splitUserId changed: Execute consolidate for new parsing of name, email case 17: @@ -302,10 +298,6 @@ public class KeychainDatabase extends SQLiteOpenHelper { case 19: // emergency fix for crashing consolidate db.execSQL("UPDATE keys SET is_secure = 1;"); - if (oldVersion == 18 || oldVersion == 19) { - // no consolidate for now, often crashes! - return; - } /* TODO actually drop this table. leaving it around for now! case 20: db.execSQL("DROP TABLE api_accounts"); @@ -316,7 +308,8 @@ public class KeychainDatabase extends SQLiteOpenHelper { */ case 20: db.execSQL(CREATE_OVERRIDDEN_WARNINGS); - if (oldVersion == 20) { + if (oldVersion == 18 || oldVersion == 19 || oldVersion == 20) { + // no consolidate for now, often crashes! return; } }