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

Fix NPE when onion address is empty

Browse Source
This commit is contained in:
Dominik Schürmann
2017-01-27 00:04:22 +01:00
parent 6e7ad0f27d
commit 72d62a847f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java
View File

@@ -50,6 +50,7 @@ import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import okhttp3.Response; import okhttp3.Response;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.pgp.PgpHelper; import org.sufficientlysecure.keychain.pgp.PgpHelper;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
@@ -154,7 +155,7 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
} }
public URI getOnionURI() throws URISyntaxException { public URI getOnionURI() throws URISyntaxException {
return getURI(mOnion); return mOnion != null ? getURI(mOnion) : null;
} }
/** /**
@@ -189,10 +190,12 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
} }
private HttpUrl getHttpUrl(ParcelableProxy proxy) throws URISyntaxException { private HttpUrl getHttpUrl(ParcelableProxy proxy) throws URISyntaxException {
HttpUrl base = proxy.isTorEnabled() ? HttpUrl.get(getOnionURI()) URI base = getUrlURI();
: HttpUrl.get(getUrlURI()); if (proxy.isTorEnabled() && getOnionURI() != null) {
base = getOnionURI();
}
return base.newBuilder() return HttpUrl.get(base).newBuilder()
.addPathSegment("pks") .addPathSegment("pks")
.build(); .build();
} }