Null check for getSelectedEntries

1 files changed, 7 insertions, 1 deletions

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>();
+        }
+
     }
 
     /**