diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-03-22 14:16:49 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-03-22 14:16:49 +0100 |
commit | 30fa184e7e6a3bbd1a26c39ef5c3037dcbe3ea32 (patch) | |
tree | c9d47233a0486e3e05e882e05d60202f5565b135 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java | |
parent | bee5075f56173b7bd05b210c778c846d154b2ee9 (diff) | |
parent | 0075c522a6773c14e34875cc7118055cde2e13be (diff) | |
download | open-keychain-30fa184e7e6a3bbd1a26c39ef5c3037dcbe3ea32.tar.gz open-keychain-30fa184e7e6a3bbd1a26c39ef5c3037dcbe3ea32.tar.bz2 open-keychain-30fa184e7e6a3bbd1a26c39ef5c3037dcbe3ea32.zip |
Merge with ashh87s pull request
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java')
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java index a3d9167a3..4871b74bc 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java @@ -91,12 +91,21 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements // sample only has one Loader, so we don't care about the ID. Uri baseUri = KeyRings.buildSecretKeyRingsUri(); + String CapFilter = null; + if (((SelectSecretKeyActivity)getActivity()).filterCertify == true) { + CapFilter = "(cert>0)"; + } + // These are the rows that we will retrieve. long now = new Date().getTime() / 1000; String[] projection = new String[] { KeyRings._ID, KeyRings.MASTER_KEY_ID, UserIds.USER_ID, + "(SELECT COUNT(cert_keys." + Keys._ID + ") FROM " + Tables.KEYS + + " AS cert_keys WHERE cert_keys." + Keys.KEY_RING_ROW_ID + " = " + + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND cert_keys." + + Keys.CAN_CERTIFY + " = '1') AS cert", "(SELECT COUNT(available_keys." + Keys._ID + ") FROM " + Tables.KEYS + " AS available_keys WHERE available_keys." + Keys.KEY_RING_ROW_ID + " = " + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID @@ -127,7 +136,7 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements // 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, null, null, orderBy); + return new CursorLoader(getActivity(), baseUri, projection, CapFilter, null, orderBy); } @Override |