diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-04 14:42:03 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-04 14:42:03 +0200 |
commit | 839294d27c4f8b3ac22573a1d429bc230f641bd2 (patch) | |
tree | 602985e170c040e801ddef45e519f354cf1e9b69 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java | |
parent | b42afcd32cc082d45daf64e37d89ba88f0c3eb56 (diff) | |
download | open-keychain-839294d27c4f8b3ac22573a1d429bc230f641bd2.tar.gz open-keychain-839294d27c4f8b3ac22573a1d429bc230f641bd2.tar.bz2 open-keychain-839294d27c4f8b3ac22573a1d429bc230f641bd2.zip |
Cleanup, prevent encrypt Intent inception
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java')
-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 ebc53ddf6..3a859f505 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -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(); } |