Bug 1300532 - Post: Rename isEnteringReaderMode()'s parameters for more clarity r?sebastian draft
authorAndrzej Hunt <ahunt@mozilla.com>
Tue, 06 Sep 2016 15:53:06 -0700
changeset 410819 43429e506eb979be6d88939640f57b5175a0a251
parent 410818 275f9c28b09f0bfc82f8b207aa94fc946f7882e2
child 530606 0c6d941dc3b1362a4b69ea53c4e7e6a94f2b6301
push id28765
push userahunt@mozilla.com
push dateTue, 06 Sep 2016 22:56:40 +0000
reviewerssebastian
bugs1300532
milestone51.0a1
Bug 1300532 - Post: Rename isEnteringReaderMode()'s parameters for more clarity r?sebastian MozReview-Commit-ID: 7Wub31YLGyS
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
@@ -19,31 +19,31 @@ public class ReaderModeUtils {
      * @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.
      */
     private static String getUrlFromAboutReader(String aboutReaderUrl) {
         return StringUtils.getQueryParameter(aboutReaderUrl, "url");
     }
 
-    public static boolean isEnteringReaderMode(String currentUrl, String newUrl) {
-        if (currentUrl == null || newUrl == null) {
+    public static boolean isEnteringReaderMode(String oldURL, String newURL) {
+        if (oldURL == null || newURL == null) {
             return false;
         }
 
-        if (!AboutPages.isAboutReader(newUrl)) {
+        if (!AboutPages.isAboutReader(newURL)) {
             return false;
         }
 
-        String urlFromAboutReader = getUrlFromAboutReader(newUrl);
+        String urlFromAboutReader = getUrlFromAboutReader(newURL);
         if (urlFromAboutReader == null) {
             return false;
         }
 
-        return urlFromAboutReader.equals(currentUrl);
+        return urlFromAboutReader.equals(oldURL);
     }
 
     public static String getAboutReaderForUrl(String url) {
         return getAboutReaderForUrl(url, -1);
     }
 
     /**
      * Obtain the underlying URL from an about:reader URL.