aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-11 13:13:35 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-11 13:13:35 +0200
commit6eb715a5d945ae24d57dea5c9f6a9a771918e025 (patch)
treee791a286bce70da947bf4e39889ef73d6a3d1674 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
parentf18a8a20acf3695d8941b2180a7714271ebddd51 (diff)
downloadopen-keychain-6eb715a5d945ae24d57dea5c9f6a9a771918e025.tar.gz
open-keychain-6eb715a5d945ae24d57dea5c9f6a9a771918e025.tar.bz2
open-keychain-6eb715a5d945ae24d57dea5c9f6a9a771918e025.zip
nullpointer check in KeychainProvider
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java4
1 files changed, 4 insertions, 0 deletions
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<String> plist = Arrays.asList(projection);