diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-26 18:10:24 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-26 18:10:30 +0200 |
commit | dc9e068790ead0399e8515e1fc72c99e90b8cd70 (patch) | |
tree | 9405e75f32f10c1d9049564b96589a9bce2114d0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 676a863b1415c09352f9c57a214ec1e3341a5a61 (diff) | |
download | open-keychain-dc9e068790ead0399e8515e1fc72c99e90b8cd70.tar.gz open-keychain-dc9e068790ead0399e8515e1fc72c99e90b8cd70.tar.bz2 open-keychain-dc9e068790ead0399e8515e1fc72c99e90b8cd70.zip |
upload: identify key by masterKeyId only
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java index 89f4ab38b..724792b70 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java @@ -20,23 +20,22 @@ package org.sufficientlysecure.keychain.service; -import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; public class UploadKeyringParcel implements Parcelable { public String mKeyserver; - public Uri mCanonicalizedPublicKeyringUri; + public long mMasterKeyId; - public UploadKeyringParcel(String keyserver, Uri keyringUri) { + public UploadKeyringParcel(String keyserver, long masterKeyId) { mKeyserver = keyserver; - mCanonicalizedPublicKeyringUri = keyringUri; + mMasterKeyId = masterKeyId; } protected UploadKeyringParcel(Parcel in) { mKeyserver = in.readString(); - mCanonicalizedPublicKeyringUri = (Uri) in.readValue(Uri.class.getClassLoader()); + mMasterKeyId = in.readLong(); } @Override @@ -47,7 +46,7 @@ public class UploadKeyringParcel implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(mKeyserver); - dest.writeValue(mCanonicalizedPublicKeyringUri); + dest.writeValue(mMasterKeyId); } public static final Creator<UploadKeyringParcel> CREATOR = new Creator<UploadKeyringParcel>() { |