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

Cleanup, prevent encrypt Intent inception

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-04 14:42:03 +02:00
parent b42afcd32c
commit 839294d27c
7 changed files with 98 additions and 25 deletions
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

@@ -165,8 +165,8 @@ public class KeychainDatabase extends SQLiteOpenHelper {
// make sure this is only done once, on the first instance!
boolean iAmIt = false;
synchronized(KeychainDatabase.class) {
if(!KeychainDatabase.apgHack) {
synchronized (KeychainDatabase.class) {
if (!KeychainDatabase.apgHack) {
iAmIt = true;
KeychainDatabase.apgHack = true;
}
@@ -334,9 +334,9 @@ public class KeychainDatabase extends SQLiteOpenHelper {
File out;
if (restore) {
in = context.getDatabasePath("debug_backup.db");
out = context.getDatabasePath("openkeychain.db");
out = context.getDatabasePath(DATABASE_NAME);
} else {
in = context.getDatabasePath("openkeychain.db");
in = context.getDatabasePath(DATABASE_NAME);
out = context.getDatabasePath("debug_backup.db");
out.createNewFile();
}