From 6eb715a5d945ae24d57dea5c9f6a9a771918e025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 11 Sep 2014 13:13:35 +0200 Subject: [PATCH] nullpointer check in KeychainProvider --- .../keychain/provider/KeychainProvider.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java index ce6d48c58..e8c39014d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -280,6 +280,10 @@ public class KeychainProvider extends ContentProvider { + " < " + new Date().getTime() / 1000 + ") AS " + KeyRings.IS_EXPIRED); qb.setProjectionMap(projectionMap); + if (projection == null) { + Log.e(Constants.TAG, "Please provide a projection!"); + } + // Need this as list so we can search in it List plist = Arrays.asList(projection);