From 504064302bc9f3949b416d6f48b2f5835ac64514 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 3 Oct 2014 04:06:44 +0200 Subject: actually use iterator interface for ParcelableFileCache in activities --- .../sufficientlysecure/keychain/ui/ImportKeysActivity.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index cabc5eb71..3df29e507 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -39,6 +39,7 @@ import android.view.ViewGroup; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.ui.ImportKeysListFragment.IteratorWithSize; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.util.Preferences; @@ -481,15 +482,17 @@ public class ImportKeysActivity extends ActionBarActivity { Bundle data = new Bundle(); // get DATA from selected key entries - ArrayList selectedEntries = mListFragment.getSelectedData(); + IteratorWithSize selectedEntries = mListFragment.getSelectedData(); - // instead of given the entries by Intent extra, cache them into a file - // to prevent Java Binder problems on heavy imports + // instead of giving the entries by Intent extra, cache them into a + // file to prevent Java Binder problems on heavy imports // read FileImportCache for more info. try { + // We parcel this iteratively into a file - anything we can + // display here, we should be able to import. ParcelableFileCache cache = new ParcelableFileCache(this, "key_import.pcl"); - cache.writeCache(selectedEntries.size(), selectedEntries.iterator()); + cache.writeCache(selectedEntries.getSize(), selectedEntries); intent.putExtra(KeychainIntentService.EXTRA_DATA, data); -- cgit v1.2.3