diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-18 14:54:25 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-18 14:54:25 +0200 |
commit | 1837dc89fa9b15d3da425bf895b3ff4a92cfb69d (patch) | |
tree | 71e4b60ead3681a773f424d8aefe86914bb1c4f0 /OpenKeychain/src/main/java | |
parent | 4dec8b2b761a5135be749e557edd562463da775d (diff) | |
download | open-keychain-1837dc89fa9b15d3da425bf895b3ff4a92cfb69d.tar.gz open-keychain-1837dc89fa9b15d3da425bf895b3ff4a92cfb69d.tar.bz2 open-keychain-1837dc89fa9b15d3da425bf895b3ff4a92cfb69d.zip |
Fix nfc signing
Diffstat (limited to 'OpenKeychain/src/main/java')
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java index e4df1c447..2c26c2da0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java @@ -569,7 +569,7 @@ public class PgpSignEncrypt { SignEncryptResult result = new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log); result.setNfcData(e.hashToSign, e.hashAlgo, e.creationTimestamp); - return new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log); + return result; } } 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 e4e843e83..167404b36 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 @@ -90,7 +90,7 @@ public class SignEncryptResult extends OperationResult { dest.writeInt(0); } dest.writeInt(mNfcAlgo); - if (mNfcHash != null) { + if (mNfcTimestamp != null) { dest.writeInt(1); dest.writeLong(mNfcTimestamp.getTime()); } else { |