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

Fix NPE in ParcelableHkpKeyserver

Browse Source
This commit is contained in:
Dominik Schürmann
2016-10-27 19:30:10 +02:00
parent 0dbe067ade
commit c14594d980
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,9 +173,11 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
URI originalURI = new URI(keyserverUrl); URI originalURI = new URI(keyserverUrl);
String scheme = originalURI.getScheme(); String scheme = originalURI.getScheme();
if (scheme == null if (scheme == null) {
|| (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme) throw new URISyntaxException("", "scheme null!");
&& !"hkp".equalsIgnoreCase(scheme) && !"hkps".equalsIgnoreCase(scheme))) { }
if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)
&& !"hkp".equalsIgnoreCase(scheme) && !"hkps".equalsIgnoreCase(scheme)) {
throw new URISyntaxException(scheme, "unsupported scheme!"); throw new URISyntaxException(scheme, "unsupported scheme!");
} }