move IteratorWithSize interface into ParcelableFileCache - much cleaner

This commit is contained in:
Vincent Breitmoser
2014-10-03 04:22:32 +02:00
parent 504064302b
commit 00bbf8c267
4 changed files with 25 additions and 20 deletions

View File

@@ -31,6 +31,7 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
import org.sufficientlysecure.keychain.util.FileHelper;
import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
import org.sufficientlysecure.keychain.util.Preferences;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
@@ -523,8 +524,9 @@ public class KeychainIntentService extends IntentService implements Progressable
// get entries from cached file
ParcelableFileCache<ParcelableKeyRing> cache =
new ParcelableFileCache<ParcelableKeyRing>(this, "key_import.pcl");
entries = cache.readCache();
numEntries = cache.getNumEntries();
IteratorWithSize<ParcelableKeyRing> it = cache.readCache();
entries = it;
numEntries = it.getSize();
}
ProviderHelper providerHelper = new ProviderHelper(this);