From e91dc022fbd5d616c2ac1b5bbd47a693b9f8f8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 1 May 2015 14:36:22 +0200
Subject: [PATCH] Fix nullpointer in EncryptKeyCompletionView

---
 .../keychain/ui/widget/EncryptKeyCompletionView.java          | 4 ++--
 1 file 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();