From f03822fefdfefba0dbe0d249a16a3783974ffb45 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 3 Oct 2014 23:08:32 +0200 Subject: [PATCH] fix nullpointer on button push while data is still loading fixes #934 --- .../keychain/ui/adapter/ImportKeysAdapter.java | 3 +++ 1 file changed, 3 insertions(+) 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 b9eb4c8d4..aabb310d0 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 @@ -91,6 +91,9 @@ public class ImportKeysAdapter extends ArrayAdapter { public ArrayList getSelectedEntries() { ArrayList result = new ArrayList(); + if (mData == null) { + return result; + } for (ImportKeysListEntry entry : mData) { if (entry.isSelected()) { result.add(entry);