diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-18 21:00:13 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-18 22:18:13 +0200 |
| commit | dd8a7c93ad8892780fdacac0060572d3db4873fb (patch) | |
| tree | 7e3012a9fd69b4adf806d65f21e003f3a827ab61 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | |
| parent | b1cd669f14039215631734776932b2ac2b287f64 (diff) | |
| download | open-keychain-dd8a7c93ad8892780fdacac0060572d3db4873fb.tar.gz open-keychain-dd8a7c93ad8892780fdacac0060572d3db4873fb.tar.bz2 open-keychain-dd8a7c93ad8892780fdacac0060572d3db4873fb.zip | |
fix unified query columns for select*fragment
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 | 9 |
1 files changed, 4 insertions, 5 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 a201db342..466665247 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -261,24 +261,23 @@ public class KeychainProvider extends ContentProvider { + " = " + Tables.KEYS + "." + Keys.MASTER_KEY_ID + ")) AS " + KeyRings.HAS_ANY_SECRET); projectionMap.put(KeyRings.HAS_ENCRYPT, - "(EXISTS (SELECT COUNT(*) FROM " + Tables.KEYS + " AS k" + "(EXISTS (SELECT * FROM " + Tables.KEYS + " AS k" +" WHERE k." + Keys.MASTER_KEY_ID + " = " + Tables.KEYS + "." + Keys.MASTER_KEY_ID + " AND k." + Keys.IS_REVOKED + " = 0" - + " AND k." + Keys.HAS_SECRET + " = 1" + " AND k." + Keys.CAN_ENCRYPT + " = 1" + " AND ( k." + Keys.EXPIRY + " IS NULL OR k." + Keys.EXPIRY - + " >= '" + new Date().getTime() / 1000 + "' )" + + " >= " + new Date().getTime() / 1000 + " )" + ")) AS " + KeyRings.HAS_ENCRYPT); projectionMap.put(KeyRings.HAS_SIGN, - "(EXISTS (SELECT COUNT(*) FROM " + Tables.KEYS + " AS k" + "(EXISTS (SELECT * FROM " + Tables.KEYS + " AS k" +" WHERE k." + Keys.MASTER_KEY_ID + " = " + Tables.KEYS + "." + Keys.MASTER_KEY_ID + " AND k." + Keys.IS_REVOKED + " = 0" + " AND k." + Keys.HAS_SECRET + " = 1" + " AND k." + Keys.CAN_SIGN + " = 1" + " AND ( k." + Keys.EXPIRY + " IS NULL OR k." + Keys.EXPIRY - + " >= '" + new Date().getTime() / 1000 + "' )" + + " >= " + new Date().getTime() / 1000 + " )" + ")) AS " + KeyRings.HAS_SIGN); qb.setProjectionMap(projectionMap); |