aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-24 15:04:23 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-24 15:04:23 +0200
commite0da0f6eb58705c8cc551a4c076ad9dd1eb3cba3 (patch)
treeb0ca094bd29dce19442dde46abb87b7a0e58726e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results
parentc7b0f77c9baa89fc617cef72eb1028768bf75832 (diff)
downloadopen-keychain-e0da0f6eb58705c8cc551a4c076ad9dd1eb3cba3.tar.gz
open-keychain-e0da0f6eb58705c8cc551a4c076ad9dd1eb3cba3.tar.bz2
open-keychain-e0da0f6eb58705c8cc551a4c076ad9dd1eb3cba3.zip
use correct pin for nfc in EncryptActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results')
-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 84eb29a62..0f3c93385 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
@@ -35,6 +35,7 @@ public class SignEncryptResult extends OperationResult {
byte[] mNfcHash;
int mNfcAlgo;
Date mNfcTimestamp;
+ String mNfcPassphrase;
public long getKeyIdPassphraseNeeded() {
return mKeyIdPassphraseNeeded;
@@ -44,10 +45,11 @@ public class SignEncryptResult extends OperationResult {
mKeyIdPassphraseNeeded = keyIdPassphraseNeeded;
}
- public void setNfcData(byte[] nfcHash, int nfcAlgo, Date nfcTimestamp) {
+ public void setNfcData(byte[] nfcHash, int nfcAlgo, Date nfcTimestamp, String passphrase) {
mNfcHash = nfcHash;
mNfcAlgo = nfcAlgo;
mNfcTimestamp = nfcTimestamp;
+ mNfcPassphrase = passphrase;
}
public byte[] getNfcHash() {
@@ -62,6 +64,10 @@ public class SignEncryptResult extends OperationResult {
return mNfcTimestamp;
}
+ public String getNfcPassphrase() {
+ return mNfcPassphrase;
+ }
+
public boolean isPending() {
return (mResult & RESULT_PENDING) == RESULT_PENDING;
}