Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r?snorp
MozReview-Commit-ID: DzE0UJfMcCI
--- 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,