From d5c6e430a5f27ac4eed16dad0dca3d716cc6c1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 3 Oct 2014 13:37:49 +0200
Subject: Null check for getSelectedEntries

---
 .../sufficientlysecure/keychain/ui/ImportKeysListFragment.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 608c0f032..16ebd6aca 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -110,7 +110,13 @@ public class ImportKeysListFragment extends ListFragment implements
     }
 
     public ArrayList<ImportKeysListEntry> getSelectedEntries() {
-        return mAdapter.getSelectedEntries();
+        if (mAdapter != null) {
+            return mAdapter.getSelectedEntries();
+        } else {
+            Log.e(Constants.TAG, "Adapter not initialized, returning empty list");
+            return new ArrayList<ImportKeysListEntry>();
+        }
+
     }
 
     /**
-- 
cgit v1.2.3