cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct pin for nfc in EncryptActivity

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-09-24 15:04:23 +02:00
parent c7b0f77c9b
commit e0da0f6eb5
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java
View File

@@ -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;
}