cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nullpointer in EncryptKeyCompletionView

Browse Source
This commit is contained in:
Dominik Schürmann
2015-05-01 14:36:22 +02:00
parent 5ad50b99a2
commit e91dc022fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
View File

@@ -136,7 +136,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
where += " AND " + KeyRings.USER_ID + " LIKE ?"; where += " AND " + KeyRings.USER_ID + " LIKE ?";
return new CursorLoader(getContext(), baseUri, KeyAdapter.PROJECTION, where, return new CursorLoader(getContext(), baseUri, KeyAdapter.PROJECTION, where,
new String[] { "%" + query + "%" }, null); new String[]{"%" + query + "%"}, null);
} }
mAdapter.setSearchQuery(null); mAdapter.setSearchQuery(null);
@@ -156,7 +156,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
@Override @Override
public void showDropDown() { public void showDropDown() {
if (mAdapter.getCursor().isClosed()) { if (mAdapter == null || mAdapter.getCursor().isClosed()) {
return; return;
} }
super.showDropDown(); super.showDropDown();