aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-13 22:08:49 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-13 22:08:53 +0200
commitff65733ed337f0eb43c09d790408f59d7d115e13 (patch)
tree00f83b5341fde82734e0d0bb0009ec66db98e34f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
parent3b8c171ecb21e4cf842131777e560b3186021637 (diff)
downloadopen-keychain-ff65733ed337f0eb43c09d790408f59d7d115e13.tar.gz
open-keychain-ff65733ed337f0eb43c09d790408f59d7d115e13.tar.bz2
open-keychain-ff65733ed337f0eb43c09d790408f59d7d115e13.zip
move IS_REVOKED table prefix to the right places
Fixes #849
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
index 48550d257..7224c4b03 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
@@ -27,6 +27,7 @@ import android.util.AttributeSet;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
public class CertifyKeySpinner extends KeySpinner {
private long mHiddenMasterKeyId = Constants.key.none;
@@ -67,7 +68,7 @@ public class CertifyKeySpinner extends KeySpinner {
String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1 AND "
+ KeychainContract.KeyRings.HAS_CERTIFY + " NOT NULL AND "
- + KeychainContract.KeyRings.IS_REVOKED + " = 0 AND "
+ + Tables.KEYS + "." + KeychainContract.KeyRings.IS_REVOKED + " = 0 AND "
+ KeychainContract.KeyRings.IS_EXPIRED + " = 0 AND " + KeychainDatabase.Tables.KEYS + "."
+ KeychainContract.KeyRings.MASTER_KEY_ID + " != " + mHiddenMasterKeyId;