diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 19:34:36 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 19:34:36 +0200 |
| commit | fe1f5489ff8e819c8711f9bde3a19573bc621110 (patch) | |
| tree | 8754f34ea06cfa0c1b6d94b4bbc1f09d0f2e5d64 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
| parent | 9aaaac068efa21c4f9fdc8ae9c79abdee685b0fc (diff) | |
| download | open-keychain-fe1f5489ff8e819c8711f9bde3a19573bc621110.tar.gz open-keychain-fe1f5489ff8e819c8711f9bde3a19573bc621110.tar.bz2 open-keychain-fe1f5489ff8e819c8711f9bde3a19573bc621110.zip | |
consolidate: implement (mostly) recovery mode
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.java | 5 |
1 files changed, 5 insertions, 0 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 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 = |