1
0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-26 00:11:52 -05:00

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

This commit is contained in:
Dominik Schürmann 2013-12-30 19:52:18 +01:00
commit a61b4887b2
2 changed files with 4 additions and 0 deletions
OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp
OpenPGP-Keychain/src/org/openintents/openpgp

@ -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);

@ -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);