diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-18 15:28:51 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-18 15:28:51 +0200 |
commit | a77c217b82a567a71ff22a419772fce861c9df95 (patch) | |
tree | c68c9adb7846ce80421f865bfe64829b6cc20de1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |
parent | 1837dc89fa9b15d3da425bf895b3ff4a92cfb69d (diff) | |
download | open-keychain-a77c217b82a567a71ff22a419772fce861c9df95.tar.gz open-keychain-a77c217b82a567a71ff22a419772fce861c9df95.tar.bz2 open-keychain-a77c217b82a567a71ff22a419772fce861c9df95.zip |
Fixes for nfc decrypt
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index e8f139b22..9d21e89b3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -418,8 +418,7 @@ public class PgpDecryptVerify { log.add(LogType.MSG_DC_PENDING_NFC, indent +1); DecryptVerifyResult result = new DecryptVerifyResult(DecryptVerifyResult.RESULT_PENDING_NFC, log); - result.setNfcEncryptedSessionKey(e.encryptedSessionKey); - // TODO save passphrase here? + result.setNfcState(e.encryptedSessionKey, mPassphrase); return result; } encryptedData = encryptedDataAsymmetric; |