Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
index ad3ebae5f..5a3770f2d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
@@ -125,9 +125,9 @@ public class CachedPublicKeyRing extends KeyRing {
     public boolean canCertify() throws PgpGeneralException {
         try {
             Object data = mProviderHelper.getGenericData(mUri,
-                    KeychainContract.KeyRings.CAN_CERTIFY,
-                    ProviderHelper.FIELD_TYPE_INTEGER);
-            return (Long) data > 0;
+                    KeychainContract.KeyRings.HAS_CERTIFY,
+                    ProviderHelper.FIELD_TYPE_NULL);
+            return !((Boolean) data);
         } catch(ProviderHelper.NotFoundException e) {
             throw new PgpGeneralException(e);
         }