consolidate: prevent concurrent calls of step 2

1 files changed, 9 insertions, 4 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 964a15d58..ead29e229 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -86,21 +86,26 @@ public class KeychainApplication extends Application {
         setupAccountAsNeeded(this);
 
         // Update keyserver list as needed
-        Preferences prefs = Preferences.getPreferences(this);
-
-        prefs.updatePreferences();
+        Preferences.getPreferences(this).updatePreferences();
 
         TlsHelper.addStaticCA("pool.sks-keyservers.net", getAssets(), "sks-keyservers.netCA.cer");
 
         TemporaryStorageProvider.cleanUp(this);
 
+        checkConsolidateRecovery();
+
+    }
+
+    public void checkConsolidateRecovery() {
+
         // restart consolidate process if it has been interruped before
-        if (prefs.getCachedConsolidate()) {
+        if (Preferences.getPreferences(this).getCachedConsolidate()) {
             // do something which calls ProviderHelper.consolidateDatabaseStep2 with a progressable
             Intent consolidateIntent = new Intent(this, ConsolidateDialogActivity.class);
             consolidateIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(consolidateIntent);
         }
+
     }
 
     public static void setupAccountAsNeeded(Context context) {