From 0182f7c951af1d46ca2fcdaf0bb60b162d7c68c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 24 Sep 2014 00:57:57 +0200
Subject: Yubikey text decryption working

---
 .../keychain/service/results/DecryptVerifyResult.java        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')

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>() {
-- 
cgit v1.2.3