Fix nullpointer in EncryptKeyCompletionView

This commit is contained in:
Dominik Schürmann 2015-05-01 14:36:22 +02:00
parent 5ad50b99a2
commit e91dc022fb

View File

@ -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();