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

refactor keyserver class structure, use AutoValue for ParcelableHkpKeyserver

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-24 22:01:02 +02:00
parent 6e18531920
commit b8d01bf9d2
34 changed files with 389 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
View File

@@ -28,7 +28,7 @@ import android.support.annotation.CheckResult;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
@@ -37,7 +37,7 @@ public abstract class CertifyActionsParcel implements Parcelable {
public abstract long getMasterKeyId();
public abstract ArrayList<CertifyAction> getCertifyActions();
@Nullable
public abstract ParcelableHkpKeyserver getParcelableKeyServer();
public abstract HkpKeyserverAddress getParcelableKeyServer();
public static Builder builder(long masterKeyId) {
return new AutoValue_CertifyActionsParcel.Builder()
@@ -49,7 +49,7 @@ public abstract class CertifyActionsParcel implements Parcelable {
public abstract static class Builder {
abstract Builder setMasterKeyId(long masterKeyId);
public abstract Builder setCertifyActions(ArrayList<CertifyAction> certifyActions);
public abstract Builder setParcelableKeyServer(ParcelableHkpKeyserver uri);
public abstract Builder setParcelableKeyServer(HkpKeyserverAddress uri);
abstract ArrayList<CertifyAction> getCertifyActions();

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ImportKeyringParcel.java
View File

@@ -25,7 +25,7 @@ import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
@AutoValue
@@ -33,16 +33,16 @@ public abstract class ImportKeyringParcel implements Parcelable {
@Nullable // If null, keys are expected to be read from a cache file in ImportExportOperations
public abstract ArrayList<ParcelableKeyRing> getKeyList();
@Nullable // must be set if keys are to be imported from a keyserver
public abstract ParcelableHkpKeyserver getKeyserver();
public abstract HkpKeyserverAddress getKeyserver();
public abstract boolean isSkipSave();
public static ImportKeyringParcel createImportKeyringParcel(ArrayList<ParcelableKeyRing> keyList,
ParcelableHkpKeyserver keyserver) {
HkpKeyserverAddress keyserver) {
return new AutoValue_ImportKeyringParcel(keyList, keyserver, false);
}
public static ImportKeyringParcel createWithSkipSave(ArrayList<ParcelableKeyRing> keyList,
ParcelableHkpKeyserver keyserver) {
HkpKeyserverAddress keyserver) {
return new AutoValue_ImportKeyringParcel(keyList, keyserver, true);
}

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

@@ -24,17 +24,18 @@ import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
@AutoValue
public abstract class RevokeKeyringParcel implements Parcelable {
public abstract long getMasterKeyId();
public abstract boolean isShouldUpload();
@Nullable
public abstract ParcelableHkpKeyserver getKeyserver();
public abstract HkpKeyserverAddress getKeyserver();
public static RevokeKeyringParcel createRevokeKeyringParcel(long masterKeyId, boolean upload,
ParcelableHkpKeyserver keyserver) {
HkpKeyserverAddress keyserver) {
return new AutoValue_RevokeKeyringParcel(masterKeyId, upload, keyserver);
}
}

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
View File

@@ -28,7 +28,7 @@ import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
import org.sufficientlysecure.keychain.util.Passphrase;
@@ -78,7 +78,7 @@ public abstract class SaveKeyringParcel implements Parcelable {
public abstract boolean isShouldUpload();
public abstract boolean isShouldUploadAtomic();
@Nullable
public abstract ParcelableHkpKeyserver getUploadKeyserver();
public abstract HkpKeyserverAddress getUploadKeyserver();
@Nullable
public abstract ChangeUnlockParcel getNewUnlock();
@@ -151,9 +151,9 @@ public abstract class SaveKeyringParcel implements Parcelable {
abstract Builder setRevokeSubKeys(List<Long> revokeSubKeys);
abstract Builder setShouldUpload(boolean upload);
abstract Builder setShouldUploadAtomic(boolean uploadAtomic);
abstract Builder setUploadKeyserver(ParcelableHkpKeyserver keyserver);
abstract Builder setUploadKeyserver(HkpKeyserverAddress keyserver);
public void setUpdateOptions(boolean upload, boolean uploadAtomic, ParcelableHkpKeyserver keyserver) {
public void setUpdateOptions(boolean upload, boolean uploadAtomic, HkpKeyserverAddress keyserver) {
setShouldUpload(upload);
setShouldUploadAtomic(uploadAtomic);
setUploadKeyserver(keyserver);

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

@@ -25,11 +25,12 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
@AutoValue
public abstract class UploadKeyringParcel implements Parcelable {
public abstract ParcelableHkpKeyserver getKeyserver();
public abstract HkpKeyserverAddress getKeyserver();
@Nullable
public abstract Long getMasterKeyId();
@Nullable
@@ -37,11 +38,11 @@ public abstract class UploadKeyringParcel implements Parcelable {
public abstract byte[] getUncachedKeyringBytes();
public static UploadKeyringParcel createWithKeyId(ParcelableHkpKeyserver keyserver, long masterKeyId) {
public static UploadKeyringParcel createWithKeyId(HkpKeyserverAddress keyserver, long masterKeyId) {
return new AutoValue_UploadKeyringParcel(keyserver, masterKeyId, null);
}
public static UploadKeyringParcel createWithKeyringBytes(ParcelableHkpKeyserver keyserver,
public static UploadKeyringParcel createWithKeyringBytes(HkpKeyserverAddress keyserver,
@NonNull byte[] uncachedKeyringBytes) {
return new AutoValue_UploadKeyringParcel(keyserver, null, uncachedKeyringBytes);
}