diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-03 23:08:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-03 23:08:32 +0200 |
| commit | f03822fefdfefba0dbe0d249a16a3783974ffb45 (patch) | |
| tree | 03e6be31e82495259b396704561c19fa8af16fdc /OpenKeychain | |
| parent | d5c6e430a5f27ac4eed16dad0dca3d716cc6c1fd (diff) | |
| download | open-keychain-f03822fefdfefba0dbe0d249a16a3783974ffb45.tar.gz open-keychain-f03822fefdfefba0dbe0d249a16a3783974ffb45.tar.bz2 open-keychain-f03822fefdfefba0dbe0d249a16a3783974ffb45.zip | |
fix nullpointer on button push while data is still loading
fixes #934
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java | 3 |
1 files changed, 3 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 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<ImportKeysListEntry> { public ArrayList<ImportKeysListEntry> getSelectedEntries() { ArrayList<ImportKeysListEntry> result = new ArrayList<ImportKeysListEntry>(); + if (mData == null) { + return result; + } for (ImportKeysListEntry entry : mData) { if (entry.isSelected()) { result.add(entry); |