aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-12-30 19:52:18 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-12-30 19:52:18 +0100
commita61b4887b229753c3ecc3003c32bce537a898f85 (patch)
treed5aa5279ee324bf250152f2414fc7fdc0d37c429 /OpenPGP-Keychain
parent7c3a53d1496a376bdaaa3bf7c79c77fe6d90a3d2 (diff)
parent65185f782417830c25d661e47e9e535a9f692401 (diff)
downloadopen-keychain-a61b4887b229753c3ecc3003c32bce537a898f85.tar.gz
open-keychain-a61b4887b229753c3ecc3003c32bce537a898f85.tar.bz2
open-keychain-a61b4887b229753c3ecc3003c32bce537a898f85.zip
Merge branch 'master' of github.com:dschuermann/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java
index 064df0f1e..6615c2146 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<OpenPgpData> CREATOR = new Creator<OpenPgpData>() {
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);