From 504064302bc9f3949b416d6f48b2f5835ac64514 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 3 Oct 2014 04:06:44 +0200
Subject: actually use iterator interface for ParcelableFileCache in activities

---
 .../keychain/ui/adapter/ImportKeysAdapter.java                | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 7b378ae79..b9eb4c8d4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -41,7 +41,6 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -91,17 +90,13 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
     }
 
     public ArrayList<ImportKeysListEntry> getSelectedEntries() {
-        ArrayList<ImportKeysListEntry> selectedData = new ArrayList<ImportKeysListEntry>();
-        // Nothing to select, nvm.
-        if (mData == null) {
-            return selectedData;
-        }
+        ArrayList<ImportKeysListEntry> result = new ArrayList<ImportKeysListEntry>();
         for (ImportKeysListEntry entry : mData) {
             if (entry.isSelected()) {
-                selectedData.add(entry);
+                result.add(entry);
             }
         }
-        return selectedData;
+        return result;
     }
 
     @Override
-- 
cgit v1.2.3