Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r?snorp draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Fri, 03 Aug 2018 20:58:46 +0200
changeset 826399 2f5056f1f95c8675057e6446d0a7acca2b70c7ad
parent 826398 28e6d9aa455ed6b9df05f081e499abce8aa874c4
push id118315
push usermozilla@buttercookie.de
push dateFri, 03 Aug 2018 18:59:43 +0000
reviewerssnorp
bugs1479311
milestone63.0a1
Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r?snorp MozReview-Commit-ID: DzE0UJfMcCI
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
--- 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
@@ -330,17 +330,17 @@ public class ToolbarDisplayLayout extend
 
     private void updateAndColorTitleFromFullURL(String url, String baseDomain, boolean isPrivate) {
         if (TextUtils.isEmpty(baseDomain)) {
             setTitle(url);
             return;
         }
 
         int index = url.indexOf(baseDomain);
-        if (index == -1) {
+        if (index == -1 || url.startsWith("javascript:")) {
             setTitle(url);
             return;
         }
 
         final SpannableStringBuilder builder = new SpannableStringBuilder(url);
 
         builder.setSpan(isPrivate ? mPrivateUrlColorSpan : mUrlColorSpan, 0, url.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
         builder.setSpan(isPrivate ? mPrivateDomainColorSpan : mDomainColorSpan,