Bug 1292903 - Use stripAboutReaderUrl in ToolbarDisplayLayout to avoid crashing on malformed about:reader URLs r?sebastian draft
authorAndrzej Hunt <ahunt@mozilla.com>
Wed, 10 Aug 2016 10:14:32 -0700
changeset 399214 747c9b0700614de86aab6e53a62c47942daaeeed
parent 399213 92b156f975ac38df14b35aec08ddd16408c33196
child 399215 e9b470dd4ef793d9247d1231e390ceb49d835449
push id25763
push userahunt@mozilla.com
push dateWed, 10 Aug 2016 17:17:11 +0000
reviewerssebastian
bugs1292903
milestone51.0a1
Bug 1292903 - Use stripAboutReaderUrl in ToolbarDisplayLayout to avoid crashing on malformed about:reader URLs r?sebastian MozReview-Commit-ID: Ab8IBeSbZ4R
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
@@ -338,17 +338,17 @@ public class ToolbarDisplayLayout extend
         setTitle(builder);
     }
 
     private String stripAboutReaderURL(final String url) {
         if (!AboutPages.isAboutReader(url)) {
             return url;
         }
 
-        return ReaderModeUtils.getUrlFromAboutReader(url);
+        return ReaderModeUtils.stripAboutReaderUrl(url);
     }
 
     private void updateSiteIdentity(@NonNull Tab tab) {
         final SiteIdentity siteIdentity = tab.getSiteIdentity();
 
         mSiteIdentityPopup.setSiteIdentity(siteIdentity);
 
         final SecurityMode securityMode;