Merge branch 'master' of github.com:open-keychain/open-keychain

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);
+        Preferences.getPreferences(this).updatePreferences();
-
-        prefs.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) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java

@@ -961,8 +961,19 @@ public class ProviderHelper {
         return consolidateDatabaseStep2(progress, true);
     }
 
+    private static boolean mConsolidateCritical = false;
+
     private ConsolidateResult consolidateDatabaseStep2(Progressable progress, boolean recovery) {
 
+        synchronized (ProviderHelper.class) {
+            if (mConsolidateCritical) {
+                log(LogLevel.ERROR, LogType.MSG_CON_ERROR_CONCURRENT);
+                return new ConsolidateResult(ConsolidateResult.RESULT_ERROR, mLog);
+            }
+            mConsolidateCritical = true;
+        }
+
+        try {
             Preferences prefs = Preferences.getPreferences(mContext);
 
             // Set flag that we have a cached consolidation here
@@ -978,7 +989,7 @@ public class ProviderHelper {
                 mIndent += 1;
             }
 
-        if ( ! prefs.getCachedConsolidate()) {
+            if (!prefs.getCachedConsolidate()) {
                 log(LogLevel.ERROR, LogType.MSG_CON_ERROR_BAD_STATE);
                 return new ConsolidateResult(ConsolidateResult.RESULT_ERROR, mLog);
             }
@@ -1011,7 +1022,8 @@ public class ProviderHelper {
                 return new ConsolidateResult(ConsolidateResult.RESULT_ERROR, mLog);
             } finally {
                 mIndent -= 1;
-        } else {
+            }
+            else {
                 log(LogLevel.DEBUG, LogType.MSG_CON_REIMPORT_SECRET_SKIP);
             }
 
@@ -1029,7 +1041,8 @@ public class ProviderHelper {
                 return new ConsolidateResult(ConsolidateResult.RESULT_ERROR, mLog);
             } finally {
                 mIndent -= 1;
-        } else {
+            }
+            else {
                 log(LogLevel.DEBUG, LogType.MSG_CON_REIMPORT_PUBLIC_SKIP);
             }
 
@@ -1067,6 +1080,10 @@ public class ProviderHelper {
 
             return new ConsolidateResult(ConsolidateResult.RESULT_OK, mLog);
 
+        } finally {
+            mConsolidateCritical = false;
+        }
+
     }
 
     /**

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java

@@ -396,6 +396,7 @@ public class OperationResultParcel implements Parcelable {
         MSG_CON_DELETE_PUBLIC (R.string.msg_con_delete_public),
         MSG_CON_DELETE_SECRET (R.string.msg_con_delete_secret),
         MSG_CON_ERROR_BAD_STATE (R.string.msg_con_error_bad_state),
+        MSG_CON_ERROR_CONCURRENT(R.string.msg_con_error_concurrent),
         MSG_CON_ERROR_DB (R.string.msg_con_error_db),
         MSG_CON_ERROR_IO_PUBLIC (R.string.msg_con_error_io_public),
         MSG_CON_ERROR_IO_SECRET (R.string.msg_con_error_io_secret),

OpenKeychain/src/main/res/values/strings.xml

@@ -673,7 +673,8 @@
 
     <!-- Consolidate -->
     <string name="msg_con">Consolidating database</string>
-    <string name="msg_con_error_bad_state">Consolidation started while no database was cached! This is probably a programming error, please file a bug report.</string>
+    <string name="msg_con_error_bad_state">Consolidation was started while no database was cached! This is probably a programming error, please file a bug report.</string>
+    <string name="msg_con_error_concurrent">Consolidation aborted, already running on other thread!</string>
     <string name="msg_con_save_secret">Saving secret keyrings</string>
     <string name="msg_con_save_public">Saving public keyrings</string>
     <string name="msg_con_db_clear">Clearing database</string>