diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-30 02:13:43 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-30 02:14:28 +0200 |
| commit | b2b19d7b2bc2d10e9d3c8a713460dd0fcbd8b25c (patch) | |
| tree | f0068c74a796c177dd2feb997ecf24a19f6bb1b4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java | |
| parent | 11d0f4510b70a0c2b14c2f28b2ab153749dad821 (diff) | |
| download | open-keychain-b2b19d7b2bc2d10e9d3c8a713460dd0fcbd8b25c.tar.gz open-keychain-b2b19d7b2bc2d10e9d3c8a713460dd0fcbd8b25c.tar.bz2 open-keychain-b2b19d7b2bc2d10e9d3c8a713460dd0fcbd8b25c.zip | |
pass (encryption) key id from Decrypt*Fragment to NfcActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index c4c6c383e..31a307194 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -89,11 +89,12 @@ public abstract class DecryptFragment extends Fragment { startActivityForResult(intent, REQUEST_CODE_PASSPHRASE); } - protected void startNfcDecrypt(String pin, byte[] encryptedSessionKey) { + protected void startNfcDecrypt(long subKeyId, String pin, byte[] encryptedSessionKey) { // build PendingIntent for Yubikey NFC operations Intent intent = new Intent(getActivity(), NfcActivity.class); intent.setAction(NfcActivity.ACTION_DECRYPT_SESSION_KEY); intent.putExtra(NfcActivity.EXTRA_DATA, new Intent()); // not used, only relevant to OpenPgpService + intent.putExtra(NfcActivity.EXTRA_KEY_ID, subKeyId); intent.putExtra(NfcActivity.EXTRA_PIN, pin); intent.putExtra(NfcActivity.EXTRA_NFC_ENC_SESSION_KEY, encryptedSessionKey); |