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

fix nullable field in HkpKeyserverAddress parcel

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-25 21:29:11 +02:00
parent 0e6ec82823
commit abd82cd88f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverAddress.java
View File

@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
@@ -33,10 +34,11 @@ public abstract class HkpKeyserverAddress implements Parcelable {
private static final short PORT_DEFAULT_HKPS = 443; private static final short PORT_DEFAULT_HKPS = 443;
public abstract String getUrl(); public abstract String getUrl();
@Nullable
public abstract String getOnion(); 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()); return new AutoValue_HkpKeyserverAddress(url, onion == null ? null : onion.trim());
} }