diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 09:19:19 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 09:19:19 +0100 |
commit | 69bb27a25c3deef2287d6863219a553f0cf7bfa9 (patch) | |
tree | 90ea9f4da81c27f84e2977aafdd02c80f82242eb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
parent | c5bcbce28fa45d8d1e5714d111f3cc24a2c99d0e (diff) | |
download | open-keychain-69bb27a25c3deef2287d6863219a553f0cf7bfa9.tar.gz open-keychain-69bb27a25c3deef2287d6863219a553f0cf7bfa9.tar.bz2 open-keychain-69bb27a25c3deef2287d6863219a553f0cf7bfa9.zip |
Fix potential NPE
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<>(); |