From 86ecd13c1d1e72159f0112ee971cbcdd90ef01cf Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 7 Jul 2018 03:43:01 +0200 Subject: [PATCH] use correct sqlite expression for expiry --- .../main/sqldelight/org/sufficientlysecure/keychain/Keys.sq | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq index db6160940..702c90472 100644 --- a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq +++ b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq @@ -99,11 +99,11 @@ SELECT fingerprint selectEffectiveSignKeyIdByMasterKeyId: SELECT key_id FROM keys - WHERE is_revoked = 0 AND is_secure = 1 AND has_secret > 1 AND ( expiry IS NULL OR expiry >= date('now') ) + WHERE is_revoked = 0 AND is_secure = 1 AND has_secret > 1 AND ( expiry IS NULL OR expiry >= strftime('%s', 'now') ) AND can_sign = 1 AND master_key_id = ?; selectEffectiveAuthKeyIdByMasterKeyId: SELECT key_id FROM keys - WHERE is_revoked = 0 AND is_secure = 1 AND has_secret > 1 AND ( expiry IS NULL OR expiry >= date('now') ) + WHERE is_revoked = 0 AND is_secure = 1 AND has_secret > 1 AND ( expiry IS NULL OR expiry >= strftime('%s', 'now') ) AND can_authenticate = 1 AND master_key_id = ?;