From 820a308ba00d94a4ae066ecc00646f27ecf8c9d7 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 22 May 2017 12:17:59 +0200
Subject: [PATCH] use autovalue for RevokeKeyringParcel

---
 .../keychain/operations/RevokeOperation.java  |  6 +--
 .../keychain/service/RevokeKeyringParcel.java | 54 +++++--------------
 .../keychain/ui/DeleteKeyDialogActivity.java  |  2 +-
 3 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java
index 19eb0160a..197842ed9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java
@@ -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);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/RevokeKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/RevokeKeyringParcel.java
index fb5de2713..bd5596771 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/RevokeKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/RevokeKeyringParcel.java
@@ -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];
-        }
-    };
 }
\ No newline at end of file
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
index c1c865312..6ae40e880 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
@@ -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));
             }