made mSignatureTime optional in CryptoOperationHelper

1 files changed, 8 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
index e9066b76c..1584b87ae 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
@@ -33,12 +33,15 @@ import org.sufficientlysecure.keychain.util.Preferences;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Date;
 
 /**
  * This class provides a communication interface to OpenPGP applications on ISO SmartCard compliant
  * NFC devices.
  * <p/>
  * For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf
+ * NOTE: If no CryptoInputParcel is passed via EXTRA_CRYPTO_INPUT, the CryptoInputParcel is created
+ * internally and is NOT meant to be used by signing operations before adding signature time
  */
 public class NfcOperationActivity extends BaseNfcActivity {
 
@@ -73,7 +76,8 @@ public class NfcOperationActivity extends BaseNfcActivity {
         if (mInputParcel == null) {
             // for compatibility when used from OpenPgpService
             // (or any place other than CryptoOperationHelper)
-            mInputParcel = new CryptoInputParcel(mRequiredInput.mSignatureTime);
+            // NOTE: This CryptoInputParcel cannot be used for signing without adding signature time
+            mInputParcel = new CryptoInputParcel();
         }
 
         setTitle(R.string.nfc_text);
@@ -131,6 +135,9 @@ public class NfcOperationActivity extends BaseNfcActivity {
                 break;
             }
             case NFC_SIGN: {
+                if (mInputParcel.getSignatureTime() == null) {
+                    mInputParcel.addSignatureTime(new Date());
+                }
                 for (int i = 0; i < mRequiredInput.mInputData.length; i++) {
                     byte[] hash = mRequiredInput.mInputData[i];
                     int algo = mRequiredInput.mSignAlgos[i];