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

Fix nfc signing

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-18 14:54:25 +02:00
parent 4dec8b2b76
commit 1837dc89fa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
View File

@@ -569,7 +569,7 @@ public class PgpSignEncrypt {
SignEncryptResult result = SignEncryptResult result =
new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log); new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log);
result.setNfcData(e.hashToSign, e.hashAlgo, e.creationTimestamp); result.setNfcData(e.hashToSign, e.hashAlgo, e.creationTimestamp);
return new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log); return result;
} }
} }

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

@@ -90,7 +90,7 @@ public class SignEncryptResult extends OperationResult {
dest.writeInt(0); dest.writeInt(0);
} }
dest.writeInt(mNfcAlgo); dest.writeInt(mNfcAlgo);
if (mNfcHash != null) { if (mNfcTimestamp != null) {
dest.writeInt(1); dest.writeInt(1);
dest.writeLong(mNfcTimestamp.getTime()); dest.writeLong(mNfcTimestamp.getTime());
} else { } else {