aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-20 21:29:11 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-20 21:29:11 +0200
commit6ed0f667cd1d556a923bc7d624f296abe17f795a (patch)
tree0ac5190116acecac38379c7fd50536a978781a29 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
parent2cc265390c8710a4a8b250ad84df2466a705336f (diff)
downloadopen-keychain-6ed0f667cd1d556a923bc7d624f296abe17f795a.tar.gz
open-keychain-6ed0f667cd1d556a923bc7d624f296abe17f795a.tar.bz2
open-keychain-6ed0f667cd1d556a923bc7d624f296abe17f795a.zip
consolidate: remove debug "breakpoint"
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java5
1 files changed, 0 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 0d6e83749..47f4682c7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -998,11 +998,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 =