diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-08-12 13:56:30 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-08-12 13:56:30 +0200 |
commit | 82a41a2f7cf446d774408f08b26ebb69e7069109 (patch) | |
tree | 06728710e420b5cc5a8fcd265c70e1a7da8928f6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | |
parent | 80674021b58395371f3dab31defb055b4ee0b288 (diff) | |
download | open-keychain-82a41a2f7cf446d774408f08b26ebb69e7069109.tar.gz open-keychain-82a41a2f7cf446d774408f08b26ebb69e7069109.tar.bz2 open-keychain-82a41a2f7cf446d774408f08b26ebb69e7069109.zip |
Only show relevant keys in encrypt, fix #756 #757
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index 67adbc136..bc3b140c3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -145,12 +145,13 @@ public class EncryptAsymmetricFragment extends Fragment implements EncryptActivi KeyRings.MASTER_KEY_ID, KeyRings.KEY_ID, KeyRings.USER_ID, - // has sign may be any subkey + KeyRings.IS_EXPIRED, KeyRings.HAS_SIGN, KeyRings.HAS_ANY_SECRET }; - String where = KeyRings.HAS_ANY_SECRET + " = 1 AND " + KeyRings.HAS_SIGN + " NOT NULL"; + String where = KeyRings.HAS_ANY_SECRET + " = 1 AND " + KeyRings.HAS_SIGN + " NOT NULL AND " + + KeyRings.IS_REVOKED + " = 0 AND " + KeyRings.IS_EXPIRED + " = 0"; // Now create and return a CursorLoader that will take care of // creating a Cursor for the data being displayed. |