aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-28 20:12:50 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-28 20:54:13 +0200
commit3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed (patch)
treea5a4fa394a5404e928ba4081352a567461b555f6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
parent0067cdf221be2189c06946f11fc94eada2afc7f1 (diff)
downloadopen-keychain-3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed.tar.gz
open-keychain-3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed.tar.bz2
open-keychain-3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed.zip
fix nullpointerexception in importkeyactivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java4
1 files changed, 4 insertions, 0 deletions
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);