From abd82cd88fee570bea4ec54853e09d65146b1f0c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 25 Jul 2017 21:29:11 +0200 Subject: [PATCH] fix nullable field in HkpKeyserverAddress parcel --- .../keychain/keyimport/HkpKeyserverAddress.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverAddress.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverAddress.java index 994895447..d4d681c1a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverAddress.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverAddress.java @@ -24,6 +24,7 @@ import java.net.URISyntaxException; import android.os.Parcelable; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; @@ -33,10 +34,11 @@ public abstract class HkpKeyserverAddress implements Parcelable { private static final short PORT_DEFAULT_HKPS = 443; public abstract String getUrl(); + @Nullable public abstract String getOnion(); - public static HkpKeyserverAddress createWithOnionProxy(@NonNull String url, String onion) { + public static HkpKeyserverAddress createWithOnionProxy(@NonNull String url, @Nullable String onion) { return new AutoValue_HkpKeyserverAddress(url, onion == null ? null : onion.trim()); }