diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-24 00:57:57 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-24 00:57:57 +0200 |
commit | 0182f7c951af1d46ca2fcdaf0bb60b162d7c68c9 (patch) | |
tree | eaf1d6c510241ce739ee4ff040abdce0f8bea5e2 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | 07704c2726e66b3834834d76c4046b144348b58e (diff) | |
download | open-keychain-0182f7c951af1d46ca2fcdaf0bb60b162d7c68c9.tar.gz open-keychain-0182f7c951af1d46ca2fcdaf0bb60b162d7c68c9.tar.bz2 open-keychain-0182f7c951af1d46ca2fcdaf0bb60b162d7c68c9.zip |
Yubikey text decryption working
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 090f2ceb6..1b4ad1fc1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -526,9 +526,8 @@ public class OpenPgpService extends RemoteService { "Decryption of symmetric content not supported by API!"); } else if ((pgpResult.getResult() & DecryptVerifyResult.RESULT_PENDING_NFC) == DecryptVerifyResult.RESULT_PENDING_NFC) { - // we assume that the pin has been cached before - String pin = passphraseCacheInterface.getCachedPassphrase(pgpResult.getNfcKeyId()); - return getNfcDecryptIntent(data, pin, pgpResult.getNfcEncryptedSessionKey()); + return getNfcDecryptIntent( + data, pgpResult.getNfcPassphrase(), pgpResult.getNfcEncryptedSessionKey()); } else { throw new PgpGeneralException( "Encountered unhandled type of pending action not supported by API!"); |