get rid of consolidate operation

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java

@@ -17,11 +17,14 @@
 
 package org.sufficientlysecure.keychain;
 
+
+import java.security.Security;
+import java.util.HashMap;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Application;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ -31,19 +34,15 @@ import android.support.annotation.Nullable;
 import android.widget.Toast;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.sufficientlysecure.keychain.network.TlsCertificatePinning;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
 import org.sufficientlysecure.keychain.service.ContactSyncAdapterService;
 import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService;
-import org.sufficientlysecure.keychain.ui.ConsolidateDialogActivity;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.PRNGFixes;
 import org.sufficientlysecure.keychain.util.Preferences;
-import org.sufficientlysecure.keychain.network.TlsCertificatePinning;
-
-import java.security.Security;
-import java.util.HashMap;
 
 
 public class KeychainApplication extends Application {
@@ -119,11 +118,6 @@ public class KeychainApplication extends Application {
         TlsCertificatePinning.addPinnedCertificate("api.keybase.io", getAssets(), "api.keybase.io.CA.cer");
 
         TemporaryFileProvider.cleanUp(this);
-
-        if (!checkConsolidateRecovery()) {
-            // force DB upgrade, https://github.com/open-keychain/open-keychain/issues/1334
-            new KeychainDatabase(this).getReadableDatabase().close();
-        }
     }
 
     /**
@@ -164,21 +158,6 @@ public class KeychainApplication extends Application {
         }
     }
 
-    /**
-     * Restart consolidate process if it has been interrupted before
-     */
-    public boolean checkConsolidateRecovery() {
-        if (Preferences.getPreferences(this).getCachedConsolidate()) {
-            Intent consolidateIntent = new Intent(this, ConsolidateDialogActivity.class);
-            consolidateIntent.putExtra(ConsolidateDialogActivity.EXTRA_CONSOLIDATE_RECOVERY, true);
-            consolidateIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(consolidateIntent);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     static void brandGlowEffect(Context context, int brandColor) {
         // no hack on Android 5
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {