[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp - tbb-commits

5 Sep 2018

commit 4b66110d0704227ee7e90b7adb092da2d3bf0ac5
Author: Jan Henning jh+bugzilla@buttercookie.de
Date:   Fri Aug 3 20:58:46 2018 +0200
Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp
MozReview-Commit-ID: DzE0UJfMcCI
--HG--
    extra : rebase_source : 2a9bcc74447a8a2862aa3c753f7bd30e1d0361dc
---
 .../src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
index f7f237eab1cc..9e8e1041027a 100644
--- a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
@@ -335,7 +335,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
         }
int index = url.indexOf(baseDomain);
-        if (index == -1) {
+        if (index == -1 || url.startsWith("javascript:")) {
             setTitle(url);
             return;
         }

    