From 4923c9b8e3e78c888cde438a5f9aac7155ed30f5 Mon Sep 17 00:00:00 2001
From: Ashley Hughes <spirit.returned@gmail.com>
Date: Wed, 26 Mar 2014 00:29:39 +0000
Subject: [PATCH] add original primary ID field to parcel

---
 .../sufficientlysecure/keychain/service/SaveKeyringParcel.java | 3 +++
 1 file changed, 3 insertions(+)

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
index ae481aa80..c99284847 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -41,6 +41,7 @@ public class SaveKeyringParcel implements Parcelable {
     public String oldPassPhrase;
     public boolean[] newKeys;
     public ArrayList<PGPSecretKey> keys;
+    public String originalPrimaryID;
 
     public SaveKeyringParcel() {}
 
@@ -62,6 +63,7 @@ public class SaveKeyringParcel implements Parcelable {
         oldPassPhrase = source.readString();
         newKeys = source.createBooleanArray();
         keys = PgpConversionHelper.BytesToPGPSecretKeyList(source.createByteArray());
+        originalPrimaryID = source.readString();
     }
 
     @Override
@@ -82,6 +84,7 @@ public class SaveKeyringParcel implements Parcelable {
         destination.writeString(oldPassPhrase);
         destination.writeBooleanArray(newKeys);
         destination.writeByteArray(PgpConversionHelper.PGPSecretKeyArrayListToBytes(keys));
+        destination.writeString(originalPrimaryID);
     }
 
     public static final Creator<SaveKeyringParcel> CREATOR = new Creator<SaveKeyringParcel>() {