diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-22 11:30:14 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-22 11:30:14 +0200 |
commit | 30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5 (patch) | |
tree | c112ebc3bfdde008a1d276972e22498bc43ea17d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java | |
parent | adea9df71411f7ea0ab08066c92048b0c2dad1ce (diff) | |
parent | 0b7fb707810f5a46a4906d5e4b82f50dcff91bcd (diff) | |
download | open-keychain-30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5.tar.gz open-keychain-30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5.tar.bz2 open-keychain-30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5.zip |
Merge commit '0b7fb70'
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java index a0aa97567..8db750917 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java @@ -45,7 +45,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan private TextView mKeyMasterKeyIdHex; private TextView mNoKeySelected; private BootstrapButton mSelectKeyButton; - private Boolean mFilterCertify; + private Boolean mFilterCertify, mFilterSign; private Uri mReceivedUri = null; @@ -72,10 +72,14 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan mCallback = callback; } - public void setFilterCertify(Boolean filterCertify) { + public void setFilterCertify(boolean filterCertify) { mFilterCertify = filterCertify; } + public void setFilterSign(boolean filterSign) { + mFilterSign = filterSign; + } + public void setNoKeySelected() { mNoKeySelected.setVisibility(View.VISIBLE); mKeyUserId.setVisibility(View.GONE); @@ -115,6 +119,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan mSelectKeyButton = (BootstrapButton) view .findViewById(R.id.select_secret_key_select_key_button); mFilterCertify = false; + mFilterSign = false; mSelectKeyButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -135,6 +140,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan private void startSelectKeyActivity() { Intent intent = new Intent(getActivity(), SelectSecretKeyActivity.class); intent.putExtra(SelectSecretKeyActivity.EXTRA_FILTER_CERTIFY, mFilterCertify); + intent.putExtra(SelectSecretKeyActivity.EXTRA_FILTER_SIGN, mFilterSign); startActivityForResult(intent, REQUEST_CODE_SELECT_KEY); } |