diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-09 09:26:03 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-09 09:26:03 +0200 |
| commit | 7c67f7a7154cc4da2c53aeb338d9bff2cbc3985a (patch) | |
| tree | e87d4c549dc44906ebbb75a60b3f3937a19c8282 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
| parent | c344158c3789180d9ca273f59e32076c6ae81272 (diff) | |
| download | open-keychain-7c67f7a7154cc4da2c53aeb338d9bff2cbc3985a.tar.gz open-keychain-7c67f7a7154cc4da2c53aeb338d9bff2cbc3985a.tar.bz2 open-keychain-7c67f7a7154cc4da2c53aeb338d9bff2cbc3985a.zip | |
Consolidate on database upgrade
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 | 18 |
1 files changed, 9 insertions, 9 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 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 { |