aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshley Hughes <spirit.returned@gmail.com>2014-03-26 00:29:39 +0000
committerAshley Hughes <spirit.returned@gmail.com>2014-03-26 00:29:39 +0000
commit4923c9b8e3e78c888cde438a5f9aac7155ed30f5 (patch)
tree867f39c31dfb5497b9c65555af12329707f69cd5
parentb77e0504aa1308da36df63038d4c05ca9aaebd71 (diff)
downloadopen-keychain-4923c9b8e3e78c888cde438a5f9aac7155ed30f5.tar.gz
open-keychain-4923c9b8e3e78c888cde438a5f9aac7155ed30f5.tar.bz2
open-keychain-4923c9b8e3e78c888cde438a5f9aac7155ed30f5.zip
add original primary ID field to parcel
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java3
1 files changed, 3 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
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>() {