Bug 1399388 - Only when new page is exactly 'about:home' will be treated as default home page. r?maliu
MozReview-Commit-ID: CVDv3jgVKC8
--- a/mobile/android/base/java/org/mozilla/gecko/AboutPages.java
+++ b/mobile/android/base/java/org/mozilla/gecko/AboutPages.java
@@ -36,16 +36,23 @@ public class AboutPages {
return url != null && url.startsWith("about:");
}
public static final boolean isTitlelessAboutPage(final String url) {
return isAboutHome(url) ||
PRIVATEBROWSING.equals(url);
}
+ public static final boolean isDefaultHomePage(final String url) {
+ if (url == null) {
+ return false;
+ }
+ return HOME.equals(url);
+ }
+
public static final boolean isAboutHome(final String url) {
if (url == null || !url.startsWith(HOME)) {
return false;
}
// We sometimes append a parameter to "about:home" to specify which page to
// show when we open the home pager. Discard this parameter when checking
// whether or not this URL is "about:home".
return HOME.equals(url.split("\\?")[0]);
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -1569,17 +1569,17 @@ public abstract class GeckoApp extends G
mWasFirstTabShownAfterActivityUnhidden = true; // Reset since we'll be loading a tab.
final SafeIntent intent = new SafeIntent(getIntent());
final String action = intent.getAction();
final String passedUri = getIntentURI(intent);
final boolean isExternalURL = passedUri != null;
- final boolean isAboutHomeURL = isExternalURL && AboutPages.isAboutHome(passedUri);
+ final boolean isAboutHomeURL = isExternalURL && AboutPages.isDefaultHomePage(passedUri);
// Start migrating as early as possible, can do this in
// parallel with Gecko load.
checkMigrateProfile();
initializeChrome();
// We need to wait here because mShouldRestore can revert back to