diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-08-12 12:57:08 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-08-12 12:57:08 +0200 |
commit | 4fdf9ab48608c02e7673cacd20e732fb9eaa08a7 (patch) | |
tree | d68b73934ed626fb7860ba4fd3f8f8e56fd8fc3a /OpenKeychain | |
parent | ae5e75f4e1e86831facc25fe97c1951b4a1aecee (diff) | |
download | open-keychain-4fdf9ab48608c02e7673cacd20e732fb9eaa08a7.tar.gz open-keychain-4fdf9ab48608c02e7673cacd20e732fb9eaa08a7.tar.bz2 open-keychain-4fdf9ab48608c02e7673cacd20e732fb9eaa08a7.zip |
Only show keyrings that have a valid sign key in from field, fixes #756
Diffstat (limited to 'OpenKeychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | 12 |
1 files changed, 2 insertions, 10 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 3de617ca0..67adbc136 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -145,24 +145,16 @@ public class EncryptAsymmetricFragment extends Fragment implements EncryptActivi KeyRings.MASTER_KEY_ID, KeyRings.KEY_ID, KeyRings.USER_ID, - KeyRings.EXPIRY, - KeyRings.IS_REVOKED, - // can certify info only related to master key - KeyRings.CAN_CERTIFY, // has sign may be any subkey KeyRings.HAS_SIGN, - KeyRings.HAS_ANY_SECRET, - KeyRings.HAS_SECRET + KeyRings.HAS_ANY_SECRET }; - String where = KeyRings.HAS_ANY_SECRET + " = 1"; + String where = KeyRings.HAS_ANY_SECRET + " = 1 AND " + KeyRings.HAS_SIGN + " NOT NULL"; // Now create and return a CursorLoader that will take care of // creating a Cursor for the data being displayed. return new CursorLoader(getActivity(), baseUri, projection, where, null, null); - /*return new CursorLoader(getActivity(), KeyRings.buildUnifiedKeyRingsUri(), - new String[]{KeyRings.USER_ID, KeyRings.KEY_ID, KeyRings.MASTER_KEY_ID, KeyRings.HAS_ANY_SECRET}, SIGN_KEY_SELECTION, - null, null);*/ } @Override |