Rebase fixes

MozillaReality · Apr 9, 2020 · 939fcc3 · 939fcc3
1 parent 2d4ec55
commit 939fcc3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/utils/UrlUtils.java b/app/src/common/shared/org/mozilla/vrbrowser/utils/UrlUtils.java
@@ -110,12 +110,12 @@ public static Boolean isDataUri(@Nullable String aUri) {
         return aUri != null && aUri.startsWith("data");
     }
 
-    public static Boolean isFileUri(@NonNull String aUri) {
-        return aUri.startsWith("file");
+    public static Boolean isFileUri(@Nullable String aUri) {
+        return aUri != null && aUri.startsWith("file");
     }
 
-    public static Boolean isBlankUri(@NonNull Context context, @NonNull String aUri) {
-        return aUri.equals(context.getString(R.string.about_blank));
+    public static Boolean isBlankUri(@Nullable Context context, @Nullable String aUri) {
+        return context != null && aUri != null && aUri.equals(context.getString(R.string.about_blank));
     }
 
     public static String titleBarUrl(@Nullable String aUri) {