From 9aaaac068efa21c4f9fdc8ae9c79abdee685b0fc Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 20 Aug 2014 19:31:51 +0200
Subject: consolidate: use KeychainProvider for deletion operation

---
 .../java/org/sufficientlysecure/keychain/provider/ProviderHelper.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(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 2867967ff..daa920f74 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -963,7 +963,6 @@ public class ProviderHelper {
 
     private ConsolidateResult consolidateDatabaseStep2(Progressable progress, boolean recovery) {
 
-
         Preferences prefs = Preferences.getPreferences(mContext);
 
         // Set flag that we have a cached consolidation here
@@ -986,7 +985,7 @@ public class ProviderHelper {
 
         // 2. wipe database (IT'S DANGEROUS)
         log(LogLevel.DEBUG, LogType.MSG_CON_DB_CLEAR);
-        new KeychainDatabase(mContext).clearDatabase();
+        mContentResolver.delete(KeyRings.buildUnifiedKeyRingsUri(), null, null);
 
         FileImportCache<ParcelableKeyRing> cacheSecret =
                 new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");
-- 
cgit v1.2.3