export: support encrypted export, first version

1 files changed, 8 insertions, 13 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java
index 0e990f24c..9b0e5573e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java
@@ -24,35 +24,31 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
+import org.sufficientlysecure.keychain.util.Passphrase;
+
 
 public class ExportKeyringParcel implements Parcelable {
-    public String mKeyserver;
     public Uri mCanonicalizedPublicKeyringUri;
-    public UncachedKeyRing mUncachedKeyRing;
+    public Passphrase mSymmetricPassphrase;
 
     public boolean mExportSecret;
     public long mMasterKeyIds[];
     public Uri mOutputUri;
 
-    public ExportKeyringParcel(String keyserver, UncachedKeyRing uncachedKeyRing) {
-        mKeyserver = keyserver;
-        mUncachedKeyRing = uncachedKeyRing;
-    }
-
-    @SuppressWarnings("unused") // TODO: is it used?
-    public ExportKeyringParcel(long[] masterKeyIds, boolean exportSecret, Uri outputUri) {
+    public ExportKeyringParcel(Passphrase symmetricPassphrase,
+            long[] masterKeyIds, boolean exportSecret, Uri outputUri) {
+        mSymmetricPassphrase = symmetricPassphrase;
         mMasterKeyIds = masterKeyIds;
         mExportSecret = exportSecret;
         mOutputUri = outputUri;
     }
 
     protected ExportKeyringParcel(Parcel in) {
-        mKeyserver = in.readString();
         mCanonicalizedPublicKeyringUri = (Uri) in.readValue(Uri.class.getClassLoader());
-        mUncachedKeyRing = (UncachedKeyRing) in.readValue(UncachedKeyRing.class.getClassLoader());
         mExportSecret = in.readByte() != 0x00;
         mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader());
         mMasterKeyIds = in.createLongArray();
+        mSymmetricPassphrase = in.readParcelable(getClass().getClassLoader());
     }
 
     @Override
@@ -62,12 +58,11 @@ public class ExportKeyringParcel implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(mKeyserver);
         dest.writeValue(mCanonicalizedPublicKeyringUri);
-        dest.writeValue(mUncachedKeyRing);
         dest.writeByte((byte) (mExportSecret ? 0x01 : 0x00));
         dest.writeValue(mOutputUri);
         dest.writeLongArray(mMasterKeyIds);
+        dest.writeParcelable(mSymmetricPassphrase, 0);
     }
 
     public static final Parcelable.Creator<ExportKeyringParcel> CREATOR = new Parcelable.Creator<ExportKeyringParcel>() {