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/DecryptTextFragment.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/DecryptTextFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java index d69778fa0..134d26c8c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java @@ -172,7 +172,7 @@ public class DecryptTextFragment extends DecryptFragment { startPassphraseDialog(Constants.key.symmetric); } else if ((pgpResult.getResult() & DecryptVerifyResult.RESULT_PENDING_NFC) == DecryptVerifyResult.RESULT_PENDING_NFC) { - startNfcDecrypt(pgpResult.getNfcPassphrase(), pgpResult.getNfcEncryptedSessionKey()); + startNfcDecrypt(pgpResult.getNfcSubKeyId(), pgpResult.getNfcPassphrase(), pgpResult.getNfcEncryptedSessionKey()); } else { throw new RuntimeException("Unhandled pending result!"); } |