diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 15:16:32 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 15:16:32 +0100 |
commit | 93c7eb72fbbf93938043566dfc1707b6714f325b (patch) | |
tree | 679641622d8149cd1333e523d63cdc402f5cc333 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java | |
parent | 88ca41d55586e5084cc3f177eb12617aa640ae1d (diff) | |
download | open-keychain-93c7eb72fbbf93938043566dfc1707b6714f325b.tar.gz open-keychain-93c7eb72fbbf93938043566dfc1707b6714f325b.tar.bz2 open-keychain-93c7eb72fbbf93938043566dfc1707b6714f325b.zip |
more data in RequiredInputParcel, OperationResult notifications
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java index abcf575af..842b75c3b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/EditKeyResult.java @@ -31,13 +31,18 @@ public class EditKeyResult extends OperationResult { public EditKeyResult(Parcel source) { super(source); - mMasterKeyId = source.readLong(); + mMasterKeyId = source.readInt() != 0 ? source.readLong() : null; } @Override public void writeToParcel(Parcel dest, int flags) { super.writeToParcel(dest, flags); - dest.writeLong(mMasterKeyId); + if (mMasterKeyId != null) { + dest.writeInt(1); + dest.writeLong(mMasterKeyId); + } else { + dest.writeInt(0); + } } public static Creator<EditKeyResult> CREATOR = new Creator<EditKeyResult>() { |