Bug 1255767 - ToolbarDisplayLayout: Only use baseDomain if it is available. r?margaret. draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Mon, 14 Mar 2016 12:24:47 +0100
changeset 339918 514e98c9c488f0bc4bee969d2ee79dcb78ec42a8
parent 339119 0d38e391b3a15ff78e4922071a067640990a44fc
child 516074 225ceee433dbe1c3cee3121af269971b79a07f35
push id12826
push users.kaspari@gmail.com
push dateMon, 14 Mar 2016 11:25:09 +0000
reviewersmargaret
bugs1255767
milestone48.0a1
Bug 1255767 - ToolbarDisplayLayout: Only use baseDomain if it is available. r?margaret. MozReview-Commit-ID: 6RXVwv9aN1K
mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
--- 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);