diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-12 23:06:35 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | f8da3d784b5f314f8ab58deab7c0a496dc8b11f3 (patch) | |
tree | 1ef65f4aeffb7b1f11c7c8823a336e3ce2b6a9ee /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | ec8c57b7803cf2f4435778cc455d0acc30482c24 (diff) | |
download | open-keychain-f8da3d784b5f314f8ab58deab7c0a496dc8b11f3.tar.gz open-keychain-f8da3d784b5f314f8ab58deab7c0a496dc8b11f3.tar.bz2 open-keychain-f8da3d784b5f314f8ab58deab7c0a496dc8b11f3.zip |
added keyserver/proxy support to certify operation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java index a11f81658..05d5546f6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java @@ -29,6 +29,7 @@ import java.util.Map; import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; +import org.sufficientlysecure.keychain.util.ParcelableProxy; /** @@ -44,6 +45,7 @@ public class CertifyActionsParcel implements Parcelable { public ArrayList<CertifyAction> mCertifyActions = new ArrayList<>(); public String keyServerUri; + public ParcelableProxy parcelableProxy; public CertifyActionsParcel(long masterKeyId) { mMasterKeyId = masterKeyId; @@ -54,6 +56,8 @@ public class CertifyActionsParcel implements Parcelable { mMasterKeyId = source.readLong(); // just like parcelables, this is meant for ad-hoc IPC only and is NOT portable! mLevel = CertifyLevel.values()[source.readInt()]; + keyServerUri = source.readString(); + parcelableProxy = source.readParcelable(ParcelableProxy.class.getClassLoader()); mCertifyActions = (ArrayList<CertifyAction>) source.readSerializable(); } @@ -66,6 +70,8 @@ public class CertifyActionsParcel implements Parcelable { public void writeToParcel(Parcel destination, int flags) { destination.writeLong(mMasterKeyId); destination.writeInt(mLevel.ordinal()); + destination.writeString(keyServerUri); + destination.writeParcelable(parcelableProxy, flags); destination.writeSerializable(mCertifyActions); } |