From 11d0f4510b70a0c2b14c2f28b2ab153749dad821 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 30 Sep 2014 02:03:17 +0200
Subject: pass key id for check from EncryptActivity to NfcActivity

---
 .../keychain/service/results/SignEncryptResult.java               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java
index 0f3c93385..cded70b7f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java
@@ -32,6 +32,7 @@ public class SignEncryptResult extends OperationResult {
 
     long mKeyIdPassphraseNeeded;
 
+    long mNfcKeyId;
     byte[] mNfcHash;
     int mNfcAlgo;
     Date mNfcTimestamp;
@@ -45,13 +46,18 @@ public class SignEncryptResult extends OperationResult {
         mKeyIdPassphraseNeeded = keyIdPassphraseNeeded;
     }
 
-    public void setNfcData(byte[] nfcHash, int nfcAlgo, Date nfcTimestamp, String passphrase) {
+    public void setNfcData(long nfcKeyId, byte[] nfcHash, int nfcAlgo, Date nfcTimestamp, String passphrase) {
+        mNfcKeyId = nfcKeyId;
         mNfcHash = nfcHash;
         mNfcAlgo = nfcAlgo;
         mNfcTimestamp = nfcTimestamp;
         mNfcPassphrase = passphrase;
     }
 
+    public long getNfcKeyId() {
+        return mNfcKeyId;
+    }
+
     public byte[] getNfcHash() {
         return mNfcHash;
     }
-- 
cgit v1.2.3