aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-19 15:56:53 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-19 15:56:53 +0200
commit9fb1050fed5cdaa238219b29958cba1c484dff7e (patch)
tree3ee5c17ae3557f324946ffb29b4e76018d4ceb12 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
parent0422d48b61011ff75ef6d85a6e45b90aebb5e58b (diff)
downloadopen-keychain-9fb1050fed5cdaa238219b29958cba1c484dff7e.tar.gz
open-keychain-9fb1050fed5cdaa238219b29958cba1c484dff7e.tar.bz2
open-keychain-9fb1050fed5cdaa238219b29958cba1c484dff7e.zip
stub for consolidate recovery in KeychainApplication
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 9b9880533..233226cc5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -84,11 +84,18 @@ public class KeychainApplication extends Application {
setupAccountAsNeeded(this);
// Update keyserver list as needed
- Preferences.getPreferences(this).updatePreferences();
+ Preferences prefs = Preferences.getPreferences(this);
+
+ prefs.updatePreferences();
TlsHelper.addStaticCA("pool.sks-keyservers.net", getAssets(), "sks-keyservers.netCA.cer");
TemporaryStorageProvider.cleanUp(this);
+
+ if (prefs.getCachedConsolidate()) {
+ // do something which calls ProviderHelper.consolidateDatabaseStep2 with a progressable
+ }
+
}
public static void setupAccountAsNeeded(Context context) {