diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 11:43:50 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 11:43:50 +0200 |
| commit | 2fa613ad625eb7e4f5fb4f9c18762f927bc093c4 (patch) | |
| tree | 7fe430e9610859c953ec01a7c017362c5b516bec | |
| parent | d0987edab96573b210ce14432432248f609b14f0 (diff) | |
| parent | b8f7dd5676db460c722276d4c98ca82e9d484562 (diff) | |
| download | open-keychain-2fa613ad625eb7e4f5fb4f9c18762f927bc093c4.tar.gz open-keychain-2fa613ad625eb7e4f5fb4f9c18762f927bc093c4.tar.bz2 open-keychain-2fa613ad625eb7e4f5fb4f9c18762f927bc093c4.zip | |
Merge pull request #766 from mar-v-in/patch-1
Handle keys without expiry date right
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | 4 |
1 files changed, 2 insertions, 2 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 2b686b8ff..c914cb5b7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -272,8 +272,8 @@ public class KeychainProvider extends ContentProvider { projectionMap.put(KeyRings.HAS_SIGN, "kS." + Keys.KEY_ID + " AS " + KeyRings.HAS_SIGN); projectionMap.put(KeyRings.IS_EXPIRED, - "(" + Tables.KEYS + "." + Keys.EXPIRY + " < " + new Date().getTime() / 1000 + ") AS " - + KeyRings.IS_EXPIRED); + "(" + Tables.KEYS + "." + Keys.EXPIRY + " IS NOT NULL AND " + Tables.KEYS + "." + Keys.EXPIRY + + " < " + new Date().getTime() / 1000 + ") AS " + KeyRings.IS_EXPIRED); qb.setProjectionMap(projectionMap); // Need this as list so we can search in it |