From aca54e31eae450e7deec54cca6654ee202c7a90f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 18 Mar 2015 18:25:44 +0100
Subject: generalize nfc crypto input structure

---
 .../keychain/operations/results/PgpSignEncryptResult.java | 15 +--------------
 .../keychain/operations/results/SignEncryptResult.java    |  3 +++
 2 files changed, 4 insertions(+), 14 deletions(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
index de2f64404..a1204c0b5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
@@ -35,7 +35,6 @@ public class PgpSignEncryptResult extends OperationResult {
     long mNfcKeyId;
     byte[] mNfcHash;
     int mNfcAlgo;
-    Date mNfcTimestamp;
     String mNfcPassphrase;
     byte[] mDetachedSignature;
 
@@ -47,11 +46,10 @@ public class PgpSignEncryptResult extends OperationResult {
         mKeyIdPassphraseNeeded = keyIdPassphraseNeeded;
     }
 
-    public void setNfcData(long nfcKeyId, byte[] nfcHash, int nfcAlgo, Date nfcTimestamp, String passphrase) {
+    public void setNfcData(long nfcKeyId, byte[] nfcHash, int nfcAlgo, String passphrase) {
         mNfcKeyId = nfcKeyId;
         mNfcHash = nfcHash;
         mNfcAlgo = nfcAlgo;
-        mNfcTimestamp = nfcTimestamp;
         mNfcPassphrase = passphrase;
     }
 
@@ -71,10 +69,6 @@ public class PgpSignEncryptResult extends OperationResult {
         return mNfcAlgo;
     }
 
-    public Date getNfcTimestamp() {
-        return mNfcTimestamp;
-    }
-
     public String getNfcPassphrase() {
         return mNfcPassphrase;
     }
@@ -95,7 +89,6 @@ public class PgpSignEncryptResult extends OperationResult {
         super(source);
         mNfcHash = source.readInt() != 0 ? source.createByteArray() : null;
         mNfcAlgo = source.readInt();
-        mNfcTimestamp = source.readInt() != 0 ? new Date(source.readLong()) : null;
         mDetachedSignature = source.readInt() != 0 ? source.createByteArray() : null;
     }
 
@@ -112,12 +105,6 @@ public class PgpSignEncryptResult extends OperationResult {
             dest.writeInt(0);
         }
         dest.writeInt(mNfcAlgo);
-        if (mNfcTimestamp != null) {
-            dest.writeInt(1);
-            dest.writeLong(mNfcTimestamp.getTime());
-        } else {
-            dest.writeInt(0);
-        }
         if (mDetachedSignature != null) {
             dest.writeInt(1);
             dest.writeByteArray(mDetachedSignature);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SignEncryptResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SignEncryptResult.java
index ed0de65b0..23e8094b9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SignEncryptResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SignEncryptResult.java
@@ -21,6 +21,9 @@ import android.os.Parcel;
 
 import java.util.ArrayList;
 
+import org.sufficientlysecure.keychain.service.input.NfcOperationsParcel;
+
+
 public class SignEncryptResult extends OperationResult {
 
     ArrayList<PgpSignEncryptResult> mResults;
-- 
cgit v1.2.3