Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain

1 files changed, 105 insertions, 0 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
new file mode 100644
index 000000000..c99284847
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2014 Ash Hughes <ashes-iontach@hotmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+package org.sufficientlysecure.keychain.service;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.spongycastle.openpgp.PGPSecretKey;
+import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
+
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+
+public class SaveKeyringParcel implements Parcelable {
+
+    public ArrayList<String> userIDs;
+    public ArrayList<String> originalIDs;
+    public ArrayList<String> deletedIDs;
+    public boolean primaryIDChanged;
+    public boolean[] moddedKeys;
+    public ArrayList<PGPSecretKey> deletedKeys;
+    public ArrayList<GregorianCalendar> keysExpiryDates;
+    public ArrayList<Integer> keysUsages;
+    public String newPassPhrase;
+    public String oldPassPhrase;
+    public boolean[] newKeys;
+    public ArrayList<PGPSecretKey> keys;
+    public String originalPrimaryID;
+
+    public SaveKeyringParcel() {}
+
+    private SaveKeyringParcel(Parcel source)
+    {
+        userIDs = (ArrayList<String>)source.readSerializable();
+        originalIDs = (ArrayList<String>)source.readSerializable();
+        deletedIDs = (ArrayList<String>)source.readSerializable();
+        primaryIDChanged = source.readByte() != 0;
+        moddedKeys = source.createBooleanArray();
+        byte[] tmp = source.createByteArray();
+        if (tmp == null)
+            deletedKeys = null;
+        else
+            deletedKeys = PgpConversionHelper.BytesToPGPSecretKeyList(tmp);
+        keysExpiryDates = (ArrayList<GregorianCalendar>)source.readSerializable();
+        keysUsages = source.readArrayList(Integer.class.getClassLoader());
+        newPassPhrase = source.readString();
+        oldPassPhrase = source.readString();
+        newKeys = source.createBooleanArray();
+        keys = PgpConversionHelper.BytesToPGPSecretKeyList(source.createByteArray());
+        originalPrimaryID = source.readString();
+    }
+
+    @Override
+    public void writeToParcel(Parcel destination, int flags)
+    {
+        destination.writeSerializable(userIDs); //might not be the best method to store.
+        destination.writeSerializable(originalIDs);
+        destination.writeSerializable(deletedIDs);
+        destination.writeByte((byte) (primaryIDChanged ? 1 : 0));
+        destination.writeBooleanArray(moddedKeys);
+        byte[] tmp = null;
+        if (deletedKeys.size() != 0)
+            tmp = PgpConversionHelper.PGPSecretKeyArrayListToBytes(deletedKeys);
+        destination.writeByteArray(tmp);
+        destination.writeSerializable(keysExpiryDates);
+        destination.writeList(keysUsages);
+        destination.writeString(newPassPhrase);
+        destination.writeString(oldPassPhrase);
+        destination.writeBooleanArray(newKeys);
+        destination.writeByteArray(PgpConversionHelper.PGPSecretKeyArrayListToBytes(keys));
+        destination.writeString(originalPrimaryID);
+    }
+
+    public static final Creator<SaveKeyringParcel> CREATOR = new Creator<SaveKeyringParcel>() {
+        public SaveKeyringParcel createFromParcel(final Parcel source) {
+            return new SaveKeyringParcel(source);
+        }
+
+        public SaveKeyringParcel[] newArray(final int size) {
+            return new SaveKeyringParcel[size];
+        }
+    };
+
+    @Override
+    public int describeContents()
+    {
+        return 0;
+    }
+}