pass CryptoInputParcel independently for SignEncryptOperation

1 files changed, 0 insertions, 30 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
index d5f3cf964..fd3c4910c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
@@ -42,14 +42,12 @@ public class PgpSignEncryptInputParcel implements Parcelable {
     protected long mSignatureMasterKeyId = Constants.key.none;
     protected Long mSignatureSubKeyId = null;
     protected int mSignatureHashAlgorithm = PgpConstants.OpenKeychainHashAlgorithmTags.USE_PREFERRED;
-    protected Passphrase mSignaturePassphrase = null;
     protected long mAdditionalEncryptId = Constants.key.none;
     protected boolean mFailOnMissingEncryptionKeyIds = false;
     protected String mCharset;
     protected boolean mCleartextSignature;
     protected boolean mDetachedSignature = false;
     protected boolean mHiddenRecipients = false;
-    protected CryptoInputParcel mCryptoInput = new CryptoInputParcel();
 
     public PgpSignEncryptInputParcel() {
 
@@ -69,15 +67,12 @@ public class PgpSignEncryptInputParcel implements Parcelable {
         mSignatureMasterKeyId = source.readLong();
         mSignatureSubKeyId = source.readInt() == 1 ? source.readLong() : null;
         mSignatureHashAlgorithm = source.readInt();
-        mSignaturePassphrase = source.readParcelable(loader);
         mAdditionalEncryptId = source.readLong();
         mFailOnMissingEncryptionKeyIds = source.readInt() == 1;
         mCharset = source.readString();
         mCleartextSignature = source.readInt() == 1;
         mDetachedSignature = source.readInt() == 1;
         mHiddenRecipients = source.readInt() == 1;
-
-        mCryptoInput = source.readParcelable(loader);
     }
 
     @Override
@@ -101,15 +96,12 @@ public class PgpSignEncryptInputParcel implements Parcelable {
             dest.writeInt(0);
         }
         dest.writeInt(mSignatureHashAlgorithm);
-        dest.writeParcelable(mSignaturePassphrase, 0);
         dest.writeLong(mAdditionalEncryptId);
         dest.writeInt(mFailOnMissingEncryptionKeyIds ? 1 : 0);
         dest.writeString(mCharset);
         dest.writeInt(mCleartextSignature ? 1 : 0);
         dest.writeInt(mDetachedSignature ? 1 : 0);
         dest.writeInt(mHiddenRecipients ? 1 : 0);
-
-        dest.writeParcelable(mCryptoInput, 0);
     }
 
     public String getCharset() {
@@ -133,15 +125,6 @@ public class PgpSignEncryptInputParcel implements Parcelable {
         return this;
     }
 
-    public Passphrase getSignaturePassphrase() {
-        return mSignaturePassphrase;
-    }
-
-    public PgpSignEncryptInputParcel  setSignaturePassphrase(Passphrase signaturePassphrase) {
-        mSignaturePassphrase = signaturePassphrase;
-        return this;
-    }
-
     public int getSignatureHashAlgorithm() {
         return mSignatureHashAlgorithm;
     }
@@ -255,19 +238,6 @@ public class PgpSignEncryptInputParcel implements Parcelable {
         return mHiddenRecipients;
     }
 
-    public PgpSignEncryptInputParcel setCryptoInput(CryptoInputParcel cryptoInput) {
-        mCryptoInput = cryptoInput;
-        return this;
-    }
-
-    public Map<ByteBuffer, byte[]> getCryptoData() {
-        return mCryptoInput.getCryptoData();
-    }
-
-    public Date getSignatureTime() {
-        return mCryptoInput.getSignatureTime();
-    }
-
     public static final Creator<PgpSignEncryptInputParcel> CREATOR = new Creator<PgpSignEncryptInputParcel>() {
         public PgpSignEncryptInputParcel createFromParcel(final Parcel source) {
             return new PgpSignEncryptInputParcel(source);