use autovalue for ConsolidateInputParcel

This commit is contained in:
Vincent Breitmoser
2017-05-22 12:35:54 +02:00
parent 68ca88c87d
commit c444ccb781
4 changed files with 11 additions and 34 deletions

View File

@@ -39,7 +39,7 @@ public class ConsolidateOperation extends BaseReadWriteOperation<ConsolidateInpu
@Override @Override
public ConsolidateResult execute(ConsolidateInputParcel consolidateInputParcel, public ConsolidateResult execute(ConsolidateInputParcel consolidateInputParcel,
CryptoInputParcel cryptoInputParcel) { CryptoInputParcel cryptoInputParcel) {
if (consolidateInputParcel.mConsolidateRecovery) { if (consolidateInputParcel.isStartFromRecovery()) {
return mKeyWritableRepository.consolidateDatabaseStep2(mProgressable); return mKeyWritableRepository.consolidateDatabaseStep2(mProgressable);
} else { } else {
return mKeyWritableRepository.consolidateDatabaseStep1(mProgressable); return mKeyWritableRepository.consolidateDatabaseStep1(mProgressable);

View File

@@ -19,40 +19,17 @@
package org.sufficientlysecure.keychain.service; package org.sufficientlysecure.keychain.service;
import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
public class ConsolidateInputParcel implements Parcelable { import com.google.auto.value.AutoValue;
public boolean mConsolidateRecovery;
public ConsolidateInputParcel(boolean consolidateRecovery) { @AutoValue
mConsolidateRecovery = consolidateRecovery; public abstract class ConsolidateInputParcel implements Parcelable {
public abstract boolean isStartFromRecovery();
public static ConsolidateInputParcel createConsolidateInputParcel(boolean consolidateRecovery) {
return new AutoValue_ConsolidateInputParcel(consolidateRecovery);
} }
protected ConsolidateInputParcel(Parcel in) {
mConsolidateRecovery = in.readByte() != 0x00;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeByte((byte) (mConsolidateRecovery ? 0x01 : 0x00));
}
public static final Parcelable.Creator<ConsolidateInputParcel> CREATOR = new Parcelable.Creator<ConsolidateInputParcel>() {
@Override
public ConsolidateInputParcel createFromParcel(Parcel in) {
return new ConsolidateInputParcel(in);
}
@Override
public ConsolidateInputParcel[] newArray(int size) {
return new ConsolidateInputParcel[size];
}
};
} }

View File

@@ -67,7 +67,7 @@ public class ConsolidateDialogActivity extends FragmentActivity
@Override @Override
public ConsolidateInputParcel createOperationInput() { public ConsolidateInputParcel createOperationInput() {
return new ConsolidateInputParcel(mRecovery); return ConsolidateInputParcel.createConsolidateInputParcel(mRecovery);
} }
@Override @Override

View File

@@ -553,7 +553,7 @@ public class KeyListFragment extends RecyclerFragment<KeySectionedListAdapter>
@Override @Override
public ConsolidateInputParcel createOperationInput() { public ConsolidateInputParcel createOperationInput() {
return new ConsolidateInputParcel(false); // we want to perform a full consolidate return ConsolidateInputParcel.createConsolidateInputParcel(false); // we want to perform a full consolidate
} }
@Override @Override