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

upload: identify key by masterKeyId only

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-26 18:10:24 +02:00
parent 676a863b14
commit dc9e068790
5 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java
View File

@@ -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>() {