From b79572d17f339cb4e361cdacad262379bde45387 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 24 Jul 2018 20:03:02 +0200 Subject: [PATCH] fix subkeys query (again) --- .../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 0b59a19db..ec3627c06 100644 --- a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq +++ b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq @@ -42,7 +42,7 @@ UPDATE keys validKeysView: CREATE VIEW validMasterKeys AS -SELECT master_key_id, rank, key_id, key_size, key_curve_oid, fingerprint, can_certify, can_sign, can_encrypt, can_authenticate, is_revoked, has_secret, is_secure, creation, expiry +SELECT master_key_id, rank, key_id, key_size, key_curve_oid, algorithm, fingerprint, can_certify, can_sign, can_encrypt, can_authenticate, is_revoked, has_secret, is_secure, creation, expiry FROM keys WHERE rank = 0 AND is_revoked = 0 AND is_secure = 1 AND (expiry IS NULL OR expiry >= strftime('%s', 'now')); @@ -91,7 +91,7 @@ SELECT master_key_id WHERE key_id = ?; selectSubkeysByMasterKeyId: -SELECT master_key_id, rank, key_id, key_size, key_curve_oid, fingerprint, can_certify, can_sign, can_encrypt, can_authenticate, is_revoked, has_secret, is_secure, creation, expiry +SELECT master_key_id, rank, key_id, key_size, key_curve_oid, algorithm, fingerprint, can_certify, can_sign, can_encrypt, can_authenticate, is_revoked, has_secret, is_secure, creation, expiry FROM keys WHERE master_key_id = ? ORDER BY rank ASC;