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/service | |
| 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/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index b9746aee5..08f51d692 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -61,7 +61,7 @@ import org.sufficientlysecure.keychain.service.OperationResults.ConsolidateResul import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult; import org.sufficientlysecure.keychain.service.OperationResults.ImportKeyResult; import org.sufficientlysecure.keychain.service.OperationResults.SaveKeyringResult; -import org.sufficientlysecure.keychain.util.FileImportCache; +import org.sufficientlysecure.keychain.util.ParcelableFileCache; import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.ProgressScaler; @@ -512,8 +512,8 @@ public class KeychainIntentService extends IntentService implements Progressable entries = data.getParcelableArrayList(IMPORT_KEY_LIST); } else { // get entries from cached file - FileImportCache<ParcelableKeyRing> cache = - new FileImportCache<ParcelableKeyRing>(this, "key_import.pcl"); + ParcelableFileCache<ParcelableKeyRing> cache = + new ParcelableFileCache<ParcelableKeyRing>(this, "key_import.pcl"); entries = cache.readCacheIntoList(); } |