diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-15 11:07:21 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-15 11:07:21 +0200 |
commit | b1dc6639300c7ecafea2ac8f26d624e0275aa780 (patch) | |
tree | 24d4d89b855ffff3c0f0d23de0c515867898a87c /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | b1fa5d992268642adf8e860812027aa0a24f3617 (diff) | |
download | open-keychain-b1dc6639300c7ecafea2ac8f26d624e0275aa780.tar.gz open-keychain-b1dc6639300c7ecafea2ac8f26d624e0275aa780.tar.bz2 open-keychain-b1dc6639300c7ecafea2ac8f26d624e0275aa780.zip |
Remove old_apg
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java | 8 |
1 files changed, 4 insertions, 4 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 a90c88c3e..1536c21fc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -227,7 +227,8 @@ public class KeychainDatabase extends SQLiteOpenHelper { if (db.equals("apg.db")) { hasApgDb = true; } else if (db.equals("apg_old.db")) { - Log.d(Constants.TAG, "Found apg_old.db"); + Log.d(Constants.TAG, "Found apg_old.db, delete it!"); + context.getDatabasePath("apg_old.db").delete(); } } } @@ -310,9 +311,8 @@ public class KeychainDatabase extends SQLiteOpenHelper { } } - // Move to a different file (but don't delete, just to be safe) - Log.d(Constants.TAG, "All done - moving apg.db to apg_old.db"); - context.getDatabasePath("apg.db").renameTo(context.getDatabasePath("apg_old.db")); + // delete old database + context.getDatabasePath("apg.db").delete(); } private static void copy(File in, File out) throws IOException { |