From 69bb27a25c3deef2287d6863219a553f0cf7bfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Nov 2015 09:19:19 +0100
Subject: Fix potential NPE

---
 .../main/java/org/sufficientlysecure/keychain/util/ContactHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
index 1abe56055..2284cc626 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
@@ -180,7 +180,7 @@ public class ContactHelper {
                 ContactsContract.Contacts.Data.IS_PRIMARY + " DESC"
         );
         if (profileCursor == null) {
-            return null;
+            return new HashSet<>();
         }
 
         Set<String> emails = new HashSet<>();
@@ -210,7 +210,7 @@ public class ContactHelper {
                 },
                 null, null, null);
         if (profileCursor == null) {
-            return null;
+            return new ArrayList<>();
         }
 
         Set<String> names = new HashSet<>();
-- 
cgit v1.2.3