From 1837dc89fa9b15d3da425bf895b3ff4a92cfb69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 18 Sep 2014 14:54:25 +0200
Subject: Fix nfc signing

---
 .../main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java   | 2 +-
 .../sufficientlysecure/keychain/service/results/SignEncryptResult.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')

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 {
-- 
cgit v1.2.3