pass (encryption) key id from Decrypt*Fragment to NfcActivity

1 files changed, 7 insertions, 1 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 4a0aec548..7fa1b7363 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
@@ -35,6 +35,7 @@ public class DecryptVerifyResult extends OperationResult {
 
     long mKeyIdPassphraseNeeded;
 
+    long mNfcSubKeyId;
     byte[] mNfcSessionKey;
     String mNfcPassphrase;
 
@@ -49,11 +50,16 @@ public class DecryptVerifyResult extends OperationResult {
         mKeyIdPassphraseNeeded = keyIdPassphraseNeeded;
     }
 
-    public void setNfcState(byte[] sessionKey, String passphrase) {
+    public void setNfcState(long subKeyId, byte[] sessionKey, String passphrase) {
+        mNfcSubKeyId = subKeyId;
         mNfcSessionKey = sessionKey;
         mNfcPassphrase = passphrase;
     }
 
+    public long getNfcSubKeyId() {
+        return mNfcSubKeyId;
+    }
+
     public byte[] getNfcEncryptedSessionKey() {
         return mNfcSessionKey;
     }