From 7c67f7a7154cc4da2c53aeb338d9bff2cbc3985a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 9 Sep 2014 09:26:03 +0200
Subject: Consolidate on database upgrade

---
 .../keychain/provider/ProviderHelper.java              | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 186a0fc88..af7bdb139 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -59,7 +59,7 @@ import org.sufficientlysecure.keychain.service.OperationResultParcel.LogType;
 import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLog;
 import org.sufficientlysecure.keychain.service.OperationResults.ConsolidateResult;
 import org.sufficientlysecure.keychain.service.OperationResults.SaveKeyringResult;
-import org.sufficientlysecure.keychain.util.FileImportCache;
+import org.sufficientlysecure.keychain.util.ParcelableFileCache;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ProgressFixedScaler;
@@ -889,8 +889,8 @@ public class ProviderHelper {
 
             Preferences.getPreferences(mContext).setCachedConsolidateNumSecrets(cursor.getCount());
 
-            FileImportCache<ParcelableKeyRing> cache =
-                    new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");
+            ParcelableFileCache<ParcelableKeyRing> cache =
+                    new ParcelableFileCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");
             cache.writeCache(new Iterator<ParcelableKeyRing>() {
                 ParcelableKeyRing ring;
 
@@ -951,8 +951,8 @@ public class ProviderHelper {
 
             Preferences.getPreferences(mContext).setCachedConsolidateNumPublics(cursor.getCount());
 
-            FileImportCache<ParcelableKeyRing> cache =
-                    new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_public.pcl");
+            ParcelableFileCache<ParcelableKeyRing> cache =
+                    new ParcelableFileCache<ParcelableKeyRing>(mContext, "consolidate_public.pcl");
             cache.writeCache(new Iterator<ParcelableKeyRing>() {
                 ParcelableKeyRing ring;
 
@@ -1041,10 +1041,10 @@ public class ProviderHelper {
             log(LogLevel.DEBUG, LogType.MSG_CON_DB_CLEAR);
             mContentResolver.delete(KeyRings.buildUnifiedKeyRingsUri(), null, null);
 
-            FileImportCache<ParcelableKeyRing> cacheSecret =
-                    new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");
-            FileImportCache<ParcelableKeyRing> cachePublic =
-                    new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_public.pcl");
+            ParcelableFileCache<ParcelableKeyRing> cacheSecret =
+                    new ParcelableFileCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");
+            ParcelableFileCache<ParcelableKeyRing> cachePublic =
+                    new ParcelableFileCache<ParcelableKeyRing>(mContext, "consolidate_public.pcl");
 
             // 3. Re-Import secret keyrings from cache
             if (numSecrets > 0) try {
-- 
cgit v1.2.3