diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-01 14:36:22 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-01 14:36:22 +0200 |
| commit | e91dc022fbd5d616c2ac1b5bbd47a693b9f8f8d1 (patch) | |
| tree | 6171f329077100c60a8556622ffe962681028609 /OpenKeychain/src | |
| parent | 5ad50b99a21642e466cad0d9e23976793f7cf765 (diff) | |
| download | open-keychain-e91dc022fbd5d616c2ac1b5bbd47a693b9f8f8d1.tar.gz open-keychain-e91dc022fbd5d616c2ac1b5bbd47a693b9f8f8d1.tar.bz2 open-keychain-e91dc022fbd5d616c2ac1b5bbd47a693b9f8f8d1.zip | |
Fix nullpointer in EncryptKeyCompletionView
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java index 525bc26ca..df6b82978 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java @@ -136,7 +136,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView where += " AND " + KeyRings.USER_ID + " LIKE ?"; return new CursorLoader(getContext(), baseUri, KeyAdapter.PROJECTION, where, - new String[] { "%" + query + "%" }, null); + new String[]{"%" + query + "%"}, null); } mAdapter.setSearchQuery(null); @@ -156,7 +156,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView @Override public void showDropDown() { - if (mAdapter.getCursor().isClosed()) { + if (mAdapter == null || mAdapter.getCursor().isClosed()) { return; } super.showDropDown(); |