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/service | |
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/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java index 54241e625..4a0aec548 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java @@ -36,7 +36,7 @@ public class DecryptVerifyResult extends OperationResult { long mKeyIdPassphraseNeeded; byte[] mNfcSessionKey; - long mNfcKeyId; + String mNfcPassphrase; OpenPgpSignatureResult mSignatureResult; OpenPgpMetadata mDecryptMetadata; @@ -49,17 +49,17 @@ public class DecryptVerifyResult extends OperationResult { mKeyIdPassphraseNeeded = keyIdPassphraseNeeded; } - public void setNfcState(byte[] sessionKey, long nfcKeyId) { + public void setNfcState(byte[] sessionKey, String passphrase) { mNfcSessionKey = sessionKey; - mNfcKeyId = nfcKeyId; + mNfcPassphrase = passphrase; } public byte[] getNfcEncryptedSessionKey() { return mNfcSessionKey; } - public long getNfcKeyId() { - return mNfcKeyId; + public String getNfcPassphrase() { + return mNfcPassphrase; } public OpenPgpSignatureResult getSignatureResult() { @@ -92,6 +92,7 @@ public class DecryptVerifyResult extends OperationResult { mSignatureResult = source.readParcelable(OpenPgpSignatureResult.class.getClassLoader()); mDecryptMetadata = source.readParcelable(OpenPgpMetadata.class.getClassLoader()); mNfcSessionKey = source.readInt() != 0 ? source.createByteArray() : null; + mNfcPassphrase = source.readString(); } public int describeContents() { @@ -109,6 +110,7 @@ public class DecryptVerifyResult extends OperationResult { } else { dest.writeInt(0); } + dest.writeString(mNfcPassphrase); } public static final Creator<DecryptVerifyResult> CREATOR = new Creator<DecryptVerifyResult>() { |