diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-03-02 15:08:57 +0100 | 
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-03-02 15:08:57 +0100 | 
| commit | 2e69952326a034bb9f1bdba4573adc9af9be3c2b (patch) | |
| tree | dd9339f645760627f87a8425f8ef9386837af900 /OpenKeychain/src | |
| parent | 8e00465c320647a7a602861f05b25705bc79b3a4 (diff) | |
| download | open-keychain-2e69952326a034bb9f1bdba4573adc9af9be3c2b.tar.gz open-keychain-2e69952326a034bb9f1bdba4573adc9af9be3c2b.tar.bz2 open-keychain-2e69952326a034bb9f1bdba4573adc9af9be3c2b.zip  | |
small nullpointer fix
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java index d87a82a24..faa2a1848 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java @@ -21,6 +21,7 @@ package org.sufficientlysecure.keychain.keyimport;  import android.net.Uri;  import android.support.annotation.NonNull; +import android.support.annotation.Nullable;  import com.squareup.okhttp.OkHttpClient;  import com.squareup.okhttp.Request; @@ -37,7 +38,6 @@ import org.sufficientlysecure.keychain.util.Log;  import java.io.IOException;  import java.net.Proxy; -import java.net.URI;  import java.net.URL;  import java.util.ArrayList;  import java.util.List; @@ -190,8 +190,11 @@ public class FacebookKeyserver extends Keyserver {          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(); -        return host.equalsIgnoreCase(FB_HOST) || host.equalsIgnoreCase(FB_HOST_WWW); +        return FB_HOST.equalsIgnoreCase(host) || FB_HOST_WWW.equalsIgnoreCase(host);      }  }  | 
