From 3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 28 Jun 2014 20:12:50 +0200
Subject: fix nullpointerexception in importkeyactivity

---
 .../org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java | 4 ++++
 1 file changed, 4 insertions(+)

(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 a44d32e5b..7a55f9aaa 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
@@ -85,6 +85,10 @@ 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;
+        }
         for (ImportKeysListEntry entry : mData) {
             if (entry.isSelected()) {
                 selectedData.add(entry);
-- 
cgit v1.2.3