diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-27 21:15:36 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-27 21:15:36 +0200 |
commit | 6c17734e73818cb2b562470dd71063169fbe1ac7 (patch) | |
tree | 9f03948dd47fe7daf238ac112c58eee889c5f2d0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java | |
parent | 08e035747135044536d0f7d2051e031185a81129 (diff) | |
download | open-keychain-6c17734e73818cb2b562470dd71063169fbe1ac7.tar.gz open-keychain-6c17734e73818cb2b562470dd71063169fbe1ac7.tar.bz2 open-keychain-6c17734e73818cb2b562470dd71063169fbe1ac7.zip |
rewrite EncryptActivity data flow
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java index 59623a610..df755edef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java @@ -77,8 +77,6 @@ public class CertifyKeyFragment extends CryptoOperationFragment private long[] mPubMasterKeyIds; - private long mSignMasterKeyId = Constants.key.none; - public static final String[] USER_IDS_PROJECTION = new String[]{ UserPackets._ID, UserPackets.MASTER_KEY_ID, @@ -149,19 +147,13 @@ public class CertifyKeyFragment extends CryptoOperationFragment vActionCertifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light), PorterDuff.Mode.SRC_IN); - mCertifyKeySpinner.setOnKeyChangedListener(new KeySpinner.OnKeyChangedListener() { - @Override - public void onKeyChanged(long masterKeyId) { - mSignMasterKeyId = masterKeyId; - } - }); - View vCertifyButton = view.findViewById(R.id.certify_key_certify_button); vCertifyButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - if (mSignMasterKeyId == Constants.key.none) { + long selectedKeyId = mCertifyKeySpinner.getSelectedKeyId(); + if (selectedKeyId == Constants.key.none) { Notify.create(getActivity(), getString(R.string.select_key_to_certify), Notify.Style.ERROR).show(); } else { @@ -307,8 +299,10 @@ public class CertifyKeyFragment extends CryptoOperationFragment Bundle data = new Bundle(); { + long selectedKeyId = mCertifyKeySpinner.getSelectedKeyId(); + // fill values for this action - CertifyActionsParcel parcel = new CertifyActionsParcel(mSignMasterKeyId); + CertifyActionsParcel parcel = new CertifyActionsParcel(selectedKeyId); parcel.mCertifyActions.addAll(certifyActions); data.putParcelable(KeychainIntentService.EXTRA_CRYPTO_INPUT, cryptoInput); |