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

1 files changed, 4 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 8fd4bc7cf..6447a180c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -832,6 +832,8 @@ public class ProviderHelper {
         log(LogLevel.START, LogType.MSG_CON);
         mIndent += 1;
 
+        progress.setProgress(R.string.progress_con_saving, 0, 100);
+
         try {
 
             log(LogLevel.DEBUG, LogType.MSG_CON_SAVE_SECRET);
@@ -891,6 +893,8 @@ public class ProviderHelper {
             mIndent -= 1;
         }
 
+        progress.setProgress(R.string.progress_con_saving, 3, 100);
+
         // 1b. fetch all public keyrings into a cache file
         try {
 
@@ -998,11 +1002,6 @@ public class ProviderHelper {
             log(LogLevel.DEBUG, LogType.MSG_CON_DB_CLEAR);
             mContentResolver.delete(KeyRings.buildUnifiedKeyRingsUri(), null, null);
 
-            // debug: break if this isn't recovery
-            if (!recovery) {
-                return new ConsolidateResult(ConsolidateResult.RESULT_ERROR, mLog);
-            }
-
             FileImportCache<ParcelableKeyRing> cacheSecret =
                     new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");
             FileImportCache<ParcelableKeyRing> cachePublic =