From 839294d27c4f8b3ac22573a1d429bc230f641bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 4 Aug 2014 14:42:03 +0200 Subject: Cleanup, prevent encrypt Intent inception --- .../sufficientlysecure/keychain/provider/KeychainDatabase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java') 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(); } -- cgit v1.2.3