moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpData.java
View File

@ -99,6 +99,7 @@ public class OpenPgpData implements Parcelable {
} }
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(type);
dest.writeString(string); dest.writeString(string);
dest.writeInt(bytes.length); dest.writeInt(bytes.length);
dest.writeByteArray(bytes); dest.writeByteArray(bytes);
@ -109,6 +110,7 @@ public class OpenPgpData implements Parcelable {
public static final Creator<OpenPgpData> CREATOR = new Creator<OpenPgpData>() { public static final Creator<OpenPgpData> CREATOR = new Creator<OpenPgpData>() {
public OpenPgpData createFromParcel(final Parcel source) { public OpenPgpData createFromParcel(final Parcel source) {
OpenPgpData vr = new OpenPgpData(); OpenPgpData vr = new OpenPgpData();
vr.type = source.readInt();
vr.string = source.readString(); vr.string = source.readString();
vr.bytes = new byte[source.readInt()]; vr.bytes = new byte[source.readInt()];
source.readByteArray(vr.bytes); source.readByteArray(vr.bytes);

2
OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java
View File

@ -99,6 +99,7 @@ public class OpenPgpData implements Parcelable {
} }
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(type);
dest.writeString(string); dest.writeString(string);
dest.writeInt(bytes.length); dest.writeInt(bytes.length);
dest.writeByteArray(bytes); dest.writeByteArray(bytes);
@ -109,6 +110,7 @@ public class OpenPgpData implements Parcelable {
public static final Creator<OpenPgpData> CREATOR = new Creator<OpenPgpData>() { public static final Creator<OpenPgpData> CREATOR = new Creator<OpenPgpData>() {
public OpenPgpData createFromParcel(final Parcel source) { public OpenPgpData createFromParcel(final Parcel source) {
OpenPgpData vr = new OpenPgpData(); OpenPgpData vr = new OpenPgpData();
vr.type = source.readInt();
vr.string = source.readString(); vr.string = source.readString();
vr.bytes = new byte[source.readInt()]; vr.bytes = new byte[source.readInt()];
source.readByteArray(vr.bytes); source.readByteArray(vr.bytes);