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

fix NPE in KeyLoader

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-11-29 14:23:37 +01:00
parent cfd3e25b6a
commit 62528fc941
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/KeyLoader.java
View File

@@ -82,7 +82,8 @@ public class KeyLoader extends AsyncTaskLoader<List<KeyInfo>> {
ArrayList<KeyInfo> keyInfos = new ArrayList<>(); ArrayList<KeyInfo> keyInfos = new ArrayList<>();
Cursor cursor; 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); cursor = contentResolver.query(keySelector.getKeyRingUri(), QUERY_PROJECTION, selection, null, QUERY_ORDER);
if (cursor == null) { if (cursor == null) {
@@ -160,6 +161,7 @@ public class KeyLoader extends AsyncTaskLoader<List<KeyInfo>> {
@AutoValue @AutoValue
public abstract static class KeySelector { public abstract static class KeySelector {
public abstract Uri getKeyRingUri(); public abstract Uri getKeyRingUri();
@Nullable
public abstract String getSelection(); public abstract String getSelection();
static KeySelector create(Uri keyRingUri, String selection) { static KeySelector create(Uri keyRingUri, String selection) {