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

small nullpointer fix

Browse Source
This commit is contained in:
Vincent Breitmoser
2016-03-02 15:08:57 +01:00
parent 8e00465c32
commit 2e69952326
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java
View File

@@ -21,6 +21,7 @@ package org.sufficientlysecure.keychain.keyimport;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request; import com.squareup.okhttp.Request;
@@ -37,7 +38,6 @@ import org.sufficientlysecure.keychain.util.Log;
import java.io.IOException; import java.io.IOException;
import java.net.Proxy; import java.net.Proxy;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -190,8 +190,11 @@ public class FacebookKeyserver extends Keyserver {
return uri.getPathSegments().get(0); return uri.getPathSegments().get(0);
} }
public static boolean isFacebookHost(Uri uri) { public static boolean isFacebookHost(@Nullable Uri uri) {
if (uri == null) {
return false;
}
String host = uri.getHost(); String host = uri.getHost();
return host.equalsIgnoreCase(FB_HOST) || host.equalsIgnoreCase(FB_HOST_WWW); return FB_HOST.equalsIgnoreCase(host) || FB_HOST_WWW.equalsIgnoreCase(host);
} }
} }