Fix nfc signing

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

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 {