From c14594d9800e1f43860c6f00ec7735623663db45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 27 Oct 2016 19:30:10 +0200 Subject: [PATCH] Fix NPE in ParcelableHkpKeyserver --- .../keychain/keyimport/ParcelableHkpKeyserver.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java index 143818122..5174358c4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java @@ -173,9 +173,11 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable { URI originalURI = new URI(keyserverUrl); String scheme = originalURI.getScheme(); - if (scheme == null - || (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme) - && !"hkp".equalsIgnoreCase(scheme) && !"hkps".equalsIgnoreCase(scheme))) { + if (scheme == null) { + throw new URISyntaxException("", "scheme null!"); + } + if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme) + && !"hkp".equalsIgnoreCase(scheme) && !"hkps".equalsIgnoreCase(scheme)) { throw new URISyntaxException(scheme, "unsupported scheme!"); }