From fe1f5489ff8e819c8711f9bde3a19573bc621110 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 20 Aug 2014 19:34:36 +0200
Subject: consolidate: implement (mostly) recovery mode

---
 .../org/sufficientlysecure/keychain/provider/ProviderHelper.java     | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')

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 daa920f74..125f33ded 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -987,6 +987,11 @@ 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 =
-- 
cgit v1.2.3