diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-07 18:49:10 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-07 18:49:29 +0200 |
| commit | 0b091aa642f6b33f70628d112fa5d2b2afb23e2d (patch) | |
| tree | 5e984193c2bb6dd34db890c5ab772138dccf8ae3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | |
| parent | 857fc43873a24e22fb7b80d00e0086c138c70ca3 (diff) | |
| download | open-keychain-0b091aa642f6b33f70628d112fa5d2b2afb23e2d.tar.gz open-keychain-0b091aa642f6b33f70628d112fa5d2b2afb23e2d.tar.bz2 open-keychain-0b091aa642f6b33f70628d112fa5d2b2afb23e2d.zip | |
flag revoked, epired and unavailable keys in selection spinner
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.java | 2 |
1 files changed, 2 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 f6df4a3eb..ce6d48c58 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -325,6 +325,7 @@ public class KeychainProvider extends ContentProvider { + " = " + Tables.KEYS + "." + Keys.MASTER_KEY_ID + " AND kS." + Keys.IS_REVOKED + " = 0" + " AND kS." + Keys.CAN_SIGN + " = 1" + + " AND kS." + Keys.HAS_SECRET + " > 1" + " AND ( kS." + Keys.EXPIRY + " IS NULL OR kS." + Keys.EXPIRY + " >= " + new Date().getTime() / 1000 + " )" + ")" : "") @@ -334,6 +335,7 @@ public class KeychainProvider extends ContentProvider { + " = " + Tables.KEYS + "." + Keys.MASTER_KEY_ID + " AND kC." + Keys.IS_REVOKED + " = 0" + " AND kC." + Keys.CAN_CERTIFY + " = 1" + + " AND kC." + Keys.HAS_SECRET + " > 1" + " AND ( kC." + Keys.EXPIRY + " IS NULL OR kC." + Keys.EXPIRY + " >= " + new Date().getTime() / 1000 + " )" + ")" : "") |