From afa7e80c913c84ada8ac78591aaca61521ff49a5 Mon Sep 17 00:00:00 2001 From: erbsenmann Date: Fri, 8 Nov 2013 19:25:35 +0100 Subject: [PATCH 1/3] Minor fix in OpenPgpData: type is now also written to and read from parcel --- OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java index 064df0f1e..6ccc2d833 100644 --- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java +++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java @@ -99,6 +99,7 @@ public class OpenPgpData implements Parcelable { } public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(type); dest.writeString(string); dest.writeInt(bytes.length); dest.writeByteArray(bytes); @@ -109,6 +110,7 @@ public class OpenPgpData implements Parcelable { public static final Creator CREATOR = new Creator() { public OpenPgpData createFromParcel(final Parcel source) { OpenPgpData vr = new OpenPgpData(); + vr.type = source.readInt(); vr.string = source.readString(); vr.bytes = new byte[source.readInt()]; source.readByteArray(vr.bytes); From 619f616244e97e163991da9fa1f4254e2e481826 Mon Sep 17 00:00:00 2001 From: erbsenmann Date: Fri, 8 Nov 2013 19:41:52 +0100 Subject: [PATCH 2/3] Minor fix in OpenPgpData: type is now also considered in parcel --- .../src/org/openintents/openpgp/OpenPgpData.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java index 064df0f1e..6ccc2d833 100644 --- a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java +++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java @@ -99,6 +99,7 @@ public class OpenPgpData implements Parcelable { } public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(type); dest.writeString(string); dest.writeInt(bytes.length); dest.writeByteArray(bytes); @@ -109,6 +110,7 @@ public class OpenPgpData implements Parcelable { public static final Creator CREATOR = new Creator() { public OpenPgpData createFromParcel(final Parcel source) { OpenPgpData vr = new OpenPgpData(); + vr.type = source.readInt(); vr.string = source.readString(); vr.bytes = new byte[source.readInt()]; source.readByteArray(vr.bytes); From dbfa4acb0ae3eb85b6fa8c157ab75fe725728f53 Mon Sep 17 00:00:00 2001 From: erbsenmann Date: Fri, 8 Nov 2013 19:47:57 +0100 Subject: [PATCH 3/3] Cleanup. --- .../src/org/openintents/openpgp/OpenPgpData.java | 2 +- OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java index 6ccc2d833..6615c2146 100644 --- a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java +++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java @@ -99,7 +99,7 @@ public class OpenPgpData implements Parcelable { } public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(type); + dest.writeInt(type); dest.writeString(string); dest.writeInt(bytes.length); dest.writeByteArray(bytes); diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java index 6ccc2d833..6615c2146 100644 --- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java +++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java @@ -99,7 +99,7 @@ public class OpenPgpData implements Parcelable { } public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(type); + dest.writeInt(type); dest.writeString(string); dest.writeInt(bytes.length); dest.writeByteArray(bytes);