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

use autovalue for RevokeKeyringParcel

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-22 12:17:59 +02:00
parent 81bceb9e16
commit 820a308ba0
3 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java
View File

@@ -53,7 +53,7 @@ public class RevokeOperation extends BaseReadWriteOperation<RevokeKeyringParcel>
// we don't cache passphrases during revocation
cryptoInputParcel = cryptoInputParcel.withNoCachePassphrase();
long masterKeyId = revokeKeyringParcel.mMasterKeyId;
long masterKeyId = revokeKeyringParcel.getMasterKeyId();
OperationResult.OperationLog log = new OperationResult.OperationLog();
log.add(OperationResult.LogType.MSG_REVOKE, 0,
@@ -75,8 +75,8 @@ public class RevokeOperation extends BaseReadWriteOperation<RevokeKeyringParcel>
new SaveKeyringParcel(masterKeyId, keyRing.getFingerprint());
// all revoke operations are made atomic as of now
saveKeyringParcel.setUpdateOptions(revokeKeyringParcel.mUpload, true,
revokeKeyringParcel.mKeyserver);
saveKeyringParcel.setUpdateOptions(revokeKeyringParcel.isShouldUpload(), true,
revokeKeyringParcel.getKeyserver());
saveKeyringParcel.mRevokeSubKeys.add(masterKeyId);

54
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/RevokeKeyringParcel.java
View File

@@ -19,50 +19,22 @@
package org.sufficientlysecure.keychain.service;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
public class RevokeKeyringParcel implements Parcelable {
@AutoValue
public abstract class RevokeKeyringParcel implements Parcelable {
public abstract long getMasterKeyId();
public abstract boolean isShouldUpload();
@Nullable
public abstract ParcelableHkpKeyserver getKeyserver();
final public long mMasterKeyId;
final public boolean mUpload;
final public ParcelableHkpKeyserver mKeyserver;
public RevokeKeyringParcel(long masterKeyId, boolean upload, ParcelableHkpKeyserver keyserver) {
mMasterKeyId = masterKeyId;
mUpload = upload;
mKeyserver = keyserver;
public static RevokeKeyringParcel createRevokeKeyringParcel(long masterKeyId, boolean upload,
ParcelableHkpKeyserver keyserver) {
return new AutoValue_RevokeKeyringParcel(masterKeyId, upload, keyserver);
}
protected RevokeKeyringParcel(Parcel in) {
mMasterKeyId = in.readLong();
mUpload = in.readByte() != 0x00;
mKeyserver = in.readParcelable(ParcelableHkpKeyserver.class.getClassLoader());
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(mMasterKeyId);
dest.writeByte((byte) (mUpload ? 0x01 : 0x00));
dest.writeParcelable(mKeyserver, flags);
}
public static final Parcelable.Creator<RevokeKeyringParcel> CREATOR = new Parcelable.Creator<RevokeKeyringParcel>() {
@Override
public RevokeKeyringParcel createFromParcel(Parcel in) {
return new RevokeKeyringParcel(in);
}
@Override
public RevokeKeyringParcel[] newArray(int size) {
return new RevokeKeyringParcel[size];
}
};
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
View File

@@ -151,7 +151,7 @@ public class DeleteKeyDialogActivity extends FragmentActivity {
return new CryptoOperationHelper.Callback<RevokeKeyringParcel, RevokeResult>() {
@Override
public RevokeKeyringParcel createOperationInput() {
return new RevokeKeyringParcel(mMasterKeyIds[0], true,
return RevokeKeyringParcel.createRevokeKeyringParcel(mMasterKeyIds[0], true,
(ParcelableHkpKeyserver) getIntent().getParcelableExtra(EXTRA_KEYSERVER));
}