Bug 1297117 - Make getUrlFromAboutReader private to avoid erronous usage r?sebastian draft
authorAndrzej Hunt <ahunt@mozilla.com>
Fri, 02 Sep 2016 12:35:08 -0700
changeset 409422 770479e18c32b6571b87b0974fa72720ae42d9f5
parent 409421 b92415d6aedc3f931762243b71f82999be50455d
child 409423 b128f77a73739c109d54beeafc1b6ab25c272687
push id28461
push userahunt@mozilla.com
push dateFri, 02 Sep 2016 19:39:30 +0000
reviewerssebastian
bugs1297117
milestone51.0a1
Bug 1297117 - Make getUrlFromAboutReader private to avoid erronous usage r?sebastian getUrlFromAboutReader can return null. There have been crashes caused by not checking this result in the past. stripAboutReaderFromUrl is a safer version which returns the input URL if necessary, and is probably what should be used in new code, hence we can make this method private. MozReview-Commit-ID: Lg7QWrpSE8F
mobile/android/base/java/org/mozilla/gecko/reader/ReaderModeUtils.java
--- a/mobile/android/base/java/org/mozilla/gecko/reader/ReaderModeUtils.java
+++ b/mobile/android/base/java/org/mozilla/gecko/reader/ReaderModeUtils.java
@@ -15,17 +15,17 @@ public class ReaderModeUtils {
     /**
      * Extract the URL from a valid about:reader URL. You may want to use stripAboutReaderUrl
      * instead to always obtain a valid String.
      *
      * @see #stripAboutReaderUrl(String) for a safer version that returns the original URL for malformed/invalid
      *     URLs.
      * @return <code>null</code> if the URL is malformed or doesn't contain a URL parameter.
      */
-    public static String getUrlFromAboutReader(String aboutReaderUrl) {
+    private static String getUrlFromAboutReader(String aboutReaderUrl) {
         return StringUtils.getQueryParameter(aboutReaderUrl, "url");
     }
 
     public static boolean isEnteringReaderMode(String currentUrl, String newUrl) {
         if (currentUrl == null || newUrl == null) {
             return false;
         }