From fd7f1873641031b9dece88db0cf0dd18a94830a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 7 Sep 2014 23:19:55 +0200
Subject: [PATCH] Fix yubikey for signAndEncrypt via API

---
 .../sufficientlysecure/keychain/remote/OpenPgpService.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index cc9912c30..00a9dc8f1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -354,6 +354,12 @@ public class OpenPgpService extends RemoteService {
                     throw new Exception(getString(R.string.error_wrong_passphrase));
                 } catch (PgpSignEncrypt.NoSigningKeyException e) {
                     throw new Exception(getString(R.string.error_no_signature_key));
+                } catch (PgpSignEncrypt.NeedNfcDataException e) {
+                    // return PendingIntent to execute NFC activity
+                    // pass through the signature creation timestamp to be used again on second execution
+                    // of PgpSignEncrypt when we have the signed hash!
+                    data.putExtra(OpenPgpApi.EXTRA_NFC_SIG_CREATION_TIMESTAMP, e.mCreationTimestamp.getTime());
+                    return getNfcIntent(data, e.mHashToSign, e.mHashAlgo);
                 }
             } finally {
                 is.close();