aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-08-12 13:54:56 +0200
committermar-v-in <github@rvin.mooo.com>2014-08-12 13:54:56 +0200
commit80674021b58395371f3dab31defb055b4ee0b288 (patch)
treedc89bb801ed38c66cc2676f49497591fe5166361 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
parent4fdf9ab48608c02e7673cacd20e732fb9eaa08a7 (diff)
downloadopen-keychain-80674021b58395371f3dab31defb055b4ee0b288.tar.gz
open-keychain-80674021b58395371f3dab31defb055b4ee0b288.tar.bz2
open-keychain-80674021b58395371f3dab31defb055b4ee0b288.zip
Add convenience method to unified keyrings to determine whether a keyring is expired, fix is_revoked for certain usages
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 56168847f..dd59f8603 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -105,8 +105,9 @@ public class KeychainContract {
public static class KeyRings implements BaseColumns, KeysColumns, UserIdsColumns {
public static final String MASTER_KEY_ID = KeysColumns.MASTER_KEY_ID;
- public static final String IS_REVOKED = KeysColumns.IS_REVOKED;
+ public static final String IS_REVOKED = KeychainDatabase.Tables.KEYS + "." + KeysColumns.IS_REVOKED;
public static final String VERIFIED = CertsColumns.VERIFIED;
+ public static final String IS_EXPIRED = "is_expired";
public static final String HAS_ANY_SECRET = "has_any_secret";
public static final String HAS_ENCRYPT = "has_encrypt";
public static final String HAS_SIGN = "has_sign";