Bug 1255767 - ToolbarDisplayLayout: Only use baseDomain if it is available. r?margaret.
MozReview-Commit-ID: 6RXVwv9aN1K
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
@@ -300,16 +300,21 @@ public class ToolbarDisplayLayout extend
final SpannableString spannable = new SpannableString(title);
spannable.setSpan(mCertificateOwnerColorSpan, 0, title.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
setTitle(spannable);
}
private void updateAndColorTitleFromFullURL(String url, String baseDomain, boolean isPrivate) {
+ if (TextUtils.isEmpty(baseDomain)) {
+ setTitle(url);
+ return;
+ }
+
int index = url.indexOf(baseDomain);
if (index == -1) {
setTitle(url);
return;
}
final SpannableStringBuilder builder = new SpannableStringBuilder(url);