diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 19:52:10 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 19:52:10 +0100 |
commit | 1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 (patch) | |
tree | c19b5db3ecfaa2b2bf933d22d6fde80b406a6953 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results | |
parent | 147003123fffc84b1d658f78d0a888479ce4ff35 (diff) | |
download | open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.tar.gz open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.tar.bz2 open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.zip |
work on ad-hoc yubikey import support
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PromoteKeyResult.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PromoteKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PromoteKeyResult.java index af9aff84a..d6c7a1ee0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PromoteKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PromoteKeyResult.java @@ -31,13 +31,18 @@ public class PromoteKeyResult extends OperationResult { public PromoteKeyResult(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<PromoteKeyResult> CREATOR = new Creator<PromoteKeyResult>() { |