Bug 1300532 - Post: Rename isEnteringReaderMode()'s parameters for more clarity r?sebastian
MozReview-Commit-ID: 7Wub31YLGyS
--- 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.