cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into development

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-05-29 11:41:02 +02:00
parent 25d0325c5f 0bbd235380
commit e174b8af3b
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
View File

@@ -22,8 +22,8 @@ public class RequiredInputParcel implements Parcelable {
public final byte[][] mInputHashes;
public final int[] mSignAlgos;
private long mMasterKeyId;
private long mSubKeyId;
private Long mMasterKeyId;
private Long mSubKeyId;
private RequiredInputParcel(RequiredInputType type, byte[][] inputHashes,
int[] signAlgos, Date signatureTime, Long masterKeyId, Long subKeyId) {
@@ -61,8 +61,8 @@ public class RequiredInputParcel implements Parcelable {
}
mSignatureTime = source.readInt() != 0 ? new Date(source.readLong()) : null;
mMasterKeyId = source.readLong();
mSubKeyId = source.readLong();
mMasterKeyId = source.readInt() != 0 ? source.readLong() : null;
mSubKeyId = source.readInt() != 0 ? source.readLong() : null;
}
@@ -137,8 +137,18 @@ public class RequiredInputParcel implements Parcelable {
} else {
dest.writeInt(0);
}
dest.writeLong(mMasterKeyId);
dest.writeLong(mSubKeyId);
if (mMasterKeyId != null) {
dest.writeInt(1);
dest.writeLong(mMasterKeyId);
} else {
dest.writeInt(0);
}
if (mSubKeyId != null) {
dest.writeInt(1);
dest.writeLong(mSubKeyId);
} else {
dest.writeInt(0);
}
}