aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-30 02:03:17 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-30 02:03:17 +0200
commit11d0f4510b70a0c2b14c2f28b2ab153749dad821 (patch)
tree813065e5e4625c3d0b2c7b7fbc519b960489bdd8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java
parentbd3f6a22cb6a5f2f637076e546ba0ec952213680 (diff)
downloadopen-keychain-11d0f4510b70a0c2b14c2f28b2ab153749dad821.tar.gz
open-keychain-11d0f4510b70a0c2b14c2f28b2ab153749dad821.tar.bz2
open-keychain-11d0f4510b70a0c2b14c2f28b2ab153749dad821.zip
pass key id for check from EncryptActivity to NfcActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java8
1 files changed, 7 insertions, 1 deletions
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;
}