moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-17 14:25:08 -05:00
Code Issues Releases Wiki Activity

Remove old_apg

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-15 11:07:21 +02:00
parent b1fa5d9922
commit b1dc663930
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,8 @@ public class KeychainDatabase extends SQLiteOpenHelper {
if (db.equals("apg.db")) { if (db.equals("apg.db")) {
hasApgDb = true; hasApgDb = true;
} else if (db.equals("apg_old.db")) { } 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) // delete old database
Log.d(Constants.TAG, "All done - moving apg.db to apg_old.db"); context.getDatabasePath("apg.db").delete();
context.getDatabasePath("apg.db").renameTo(context.getDatabasePath("apg_old.db"));
} }
private static void copy(File in, File out) throws IOException { private static void copy(File in, File out) throws IOException {