Fix crash if onLoadError uri parameter is null (#3000)

MozillaReality · Mar 20, 2020 · a6ae172 · a6ae172
1 parent 1915c2d
commit a6ae172
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
@@ -969,7 +969,7 @@ public GeckoResult<GeckoSession> onNewSession(@NonNull GeckoSession aSession, @N
     }
 
     @Override
-    public GeckoResult<String> onLoadError(@NonNull GeckoSession session, String uri,  @NonNull WebRequestError error) {
+    public GeckoResult<String> onLoadError(@NonNull GeckoSession session, @Nullable String uri,  @NonNull WebRequestError error) {
         Log.d(LOGTAG, "Session onLoadError: " + uri);
 
         return GeckoResult.fromValue(InternalPages.createErrorPageDataURI(mContext, uri, error.code));

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/utils/InternalPages.java b/app/src/common/shared/org/mozilla/vrbrowser/utils/InternalPages.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.util.Base64;
 
+import androidx.annotation.Nullable;
+
 import org.mozilla.vrbrowser.R;
 
 import org.mozilla.geckoview.WebRequestError;
@@ -115,7 +117,7 @@ public static PageResources create(int html, int css) {
     }
 
     public static String createErrorPageDataURI(Context context,
-                                                String uri,
+                                                @Nullable String uri,
                                                 int errorType) {
         String html = ErrorPages.INSTANCE.createErrorPage(
                 context,
@@ -134,9 +136,10 @@ public static String createErrorPageDataURI(Context context,
                 showSSLAdvanced = false;
         }
 
-        html = html
-                .replace("%url%", uri)
-                .replace("%advancedSSLStyle%", showSSLAdvanced ? "block" : "none");
+        if (uri != null) {
+            html = html.replace("%url%", uri);
+        }
+        html = html.replace("%advancedSSLStyle%", showSSLAdvanced ? "block" : "none");
 
         return "data:text/html;base64," + Base64.encodeToString(html.getBytes(), Base64.NO_WRAP);
     }