From 62528fc941fd2c3f5543b7f550933e13ee3d886d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 29 Nov 2017 14:23:37 +0100
Subject: [PATCH] fix NPE in KeyLoader

---
 .../keychain/remote/ui/dialog/KeyLoader.java                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/KeyLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/KeyLoader.java
index bab1a1b8b..3e5af8bed 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/KeyLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/KeyLoader.java
@@ -82,7 +82,8 @@ public class KeyLoader extends AsyncTaskLoader<List<KeyInfo>> {
         ArrayList<KeyInfo> keyInfos = new ArrayList<>();
         Cursor cursor;
 
-        String selection = QUERY_WHERE + " AND " + keySelector.getSelection();
+        String additionalSelection = keySelector.getSelection();
+        String selection = QUERY_WHERE + (additionalSelection != null ? " AND " + additionalSelection : "");
         cursor = contentResolver.query(keySelector.getKeyRingUri(), QUERY_PROJECTION, selection, null, QUERY_ORDER);
 
         if (cursor == null) {
@@ -160,6 +161,7 @@ public class KeyLoader extends AsyncTaskLoader<List<KeyInfo>> {
     @AutoValue
     public abstract static class KeySelector {
         public abstract Uri getKeyRingUri();
+        @Nullable
         public abstract String getSelection();
 
         static KeySelector create(Uri keyRingUri, String selection) {