diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-13 22:08:49 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-13 22:08:53 +0200 |
| commit | ff65733ed337f0eb43c09d790408f59d7d115e13 (patch) | |
| tree | 00f83b5341fde82734e0d0bb0009ec66db98e34f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | 3b8c171ecb21e4cf842131777e560b3186021637 (diff) | |
| download | open-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')
2 files changed, 4 insertions, 2 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; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java index f3ead3faa..c1045687d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java @@ -47,6 +47,7 @@ import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; +import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; import org.sufficientlysecure.keychain.util.Log; import java.util.ArrayList; @@ -128,7 +129,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView { }; String where = KeyRings.HAS_ENCRYPT + " NOT NULL AND " + KeyRings.IS_EXPIRED + " = 0 AND " - + KeyRings.IS_REVOKED + " = 0"; + + Tables.KEYS + "." + KeyRings.IS_REVOKED + " = 0"; return new CursorLoader(getContext(), baseUri, projection, where, null, null); } |