From 428d6b1182f11a0ecae7aaa7c4f983aa458cd142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 31 Aug 2014 21:52:14 +0200 Subject: prevent nullpointer in ImportKeysServerFragment, return empty lists instead of null --- .../java/org/sufficientlysecure/keychain/helper/ContactHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java index 016d6dc14..6124112d3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java @@ -222,7 +222,7 @@ public class ContactHelper { Cursor mailCursor = resolver.query(ContactsContract.CommonDataKinds.Email.CONTENT_URI, new String[]{ContactsContract.CommonDataKinds.Email.DATA}, null, null, null); - if (mailCursor == null) return null; + if (mailCursor == null) return new ArrayList(); Set mails = new HashSet(); while (mailCursor.moveToNext()) { @@ -240,7 +240,7 @@ public class ContactHelper { Cursor cursor = resolver.query(ContactsContract.Contacts.CONTENT_URI, new String[]{ContactsContract.Contacts.DISPLAY_NAME}, null, null, null); - if (cursor == null) return null; + if (cursor == null) return new ArrayList(); Set names = new HashSet(); while (cursor.moveToNext()) { -- cgit v1.2.3