Issue 3127 - Merge conflicts, base 42.0.1

mobile/android/app/mobile.js

Index: mobile/android/app/mobile.js
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 0567a3e7c7ba765fcf8dcdfc3701d406d8a6969c..ec27a048831d07fe7acf8aa643cbaa02d31557d4 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -182,7 +182,7 @@ pref("xpinstall.whitelist.add.180", "https://marketplace.firefox.com");
 
 pref("xpinstall.signatures.required", false);
 
-pref("extensions.enabledScopes", 1);
+pref("extensions.enabledScopes", 4);
 pref("extensions.autoupdate.enabled", true);
 pref("extensions.autoupdate.interval", 86400);
 pref("extensions.update.enabled", false);
@@ -197,6 +197,13 @@ pref("extensions.hideUpdateButton", false);
 pref("extensions.strictCompatibility", false);
 pref("extensions.minCompatibleAppVersion", "11.0");
 
+// We need to disable compatibility checking in Adblock Browser for now,
+// since it uses different versions than Firefox, and we don't want to modify
+// the embedded Adblock Plus at this point. In the future, Adblock Browser
+// should have its own app ID, and we should properly declare compatibility in
+// Adblock Plus.
+pref("extensions.checkCompatibility.nightly", false);
+
 pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 
@@ -264,9 +271,13 @@ pref("browser.xul.error_pages.expert_bad_cert", false);
 pref("browser.search.order.1", "chrome://browser/locale/region.properties");
 pref("browser.search.order.2", "chrome://browser/locale/region.properties");
 pref("browser.search.order.3", "chrome://browser/locale/region.properties");
+// Added 4+5 according to https://issues.adblockplus.org/ticket/3128
+pref("browser.search.order.4", "chrome://browser/locale/region.properties");
+pref("browser.search.order.5", "chrome://browser/locale/region.properties");
 
 // Market-specific search defaults
-pref("browser.search.geoSpecificDefaults", true);
+// Changed in Adblock Browser, see: https://issues.adblockplus.org/ticket/3003.
+pref("browser.search.geoSpecificDefaults", false);
 pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
 
 // US specific default (used as a fallback if the geoSpecificDefaults request fails).
@@ -274,6 +285,9 @@ pref("browser.search.defaultenginename.US", "chrome://browser/locale/region.prop
 pref("browser.search.order.US.1", "chrome://browser/locale/region.properties");
 pref("browser.search.order.US.2", "chrome://browser/locale/region.properties");
 pref("browser.search.order.US.3", "chrome://browser/locale/region.properties");
+// Added 4+5 (just in case) according to https://issues.adblockplus.org/ticket/3128
+pref("browser.search.order.US.4", "chrome://browser/locale/region.properties");
+pref("browser.search.order.US.5", "chrome://browser/locale/region.properties");
 
 // disable updating
 pref("browser.search.update", false);
@@ -454,9 +468,11 @@ pref("plugin.default.state", 1);
 // product URLs
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
-pref("app.support.baseURL", "http://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/");
-// Used to submit data to input from about:feedback
-pref("app.feedback.postURL", "https://input.mozilla.org/api/v1/feedback/");
+// Changed in Adblock Browser, see: https://issues.adblockplus.org/ticket/2930.
+pref("app.support.baseURL", "https://adblockplus.org/redirect?link=adblock_browser_android_support&lang=%LOCALE%");
+// Used to submit data to input from about:feedback, changed in Adblock Browser,
+// see: https://issues.adblockplus.org/ticket/2930.
+pref("app.feedback.postURL", "https://adblockbrowser.org/submit-feedback/");
 pref("app.privacyURL", "https://www.mozilla.org/privacy/firefox/");
 pref("app.creditsURL", "http://www.mozilla.org/credits/");
 pref("app.channelURL", "http://www.mozilla.org/%LOCALE%/firefox/channel/");
@@ -524,7 +540,11 @@ pref("app.update.timerMinimumDelay", 30); // seconds
 // used by update service to decide whether or not to
 // automatically download an update
 pref("app.update.autodownload", "wifi");
-pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%MOZ_VERSION%/update.xml");
+#ifdef ABB_RELEASE_BUILD
+pref("app.update.url.android", "https://update.adblockplus.org/adblockbrowser/updates.xml?addonName=adblockbrowser&addonVersion=%VERSION%.%BUILD_ID%&applicationName=android&applicationVersion=%OS_VERSION_INT%&platform=gecko&platformVersion=%MOZ_VERSION%&locale=%LOCALE%");
+#else
+pref("app.update.url.android", "https://adblockplus.org/devbuilds/adblockbrowser/updates.xml?addonName=adblockbrowser&addonVersion=%VERSION%.%BUILD_ID%&applicationName=android&applicationVersion=%OS_VERSION_INT%&platform=gecko&platformVersion=%MOZ_VERSION%&locale=%LOCALE%");
+#endif
 
 #ifdef MOZ_UPDATER
 /* prefs used specifically for updating the app */
@@ -828,9 +848,10 @@ pref("browser.snippets.geoUrl", "https://geo.mozilla.org/country.json");
 pref("browser.snippets.statsUrl", "https://snippets-stats.mozilla.org/mobile");
 
 // These prefs require a restart to take effect.
-pref("browser.snippets.enabled", true);
-pref("browser.snippets.syncPromo.enabled", true);
-pref("browser.snippets.firstrunHomepage.enabled", true);
+// We set the following three prefs to 'false', see https://issues.adblockplus.org/ticket/2785
+pref("browser.snippets.enabled", false);
+pref("browser.snippets.syncPromo.enabled", false);
+pref("browser.snippets.firstrunHomepage.enabled", false);
 
 // The URL of the APK factory from which we obtain APKs for webapps.
 pref("browser.webapps.apkFactoryUrl", "https://controller.apk.firefox.com/application.apk");
@@ -873,6 +894,9 @@ pref("dom.meta-viewport.enabled", true);
 // Enable GMP support in the addon manager.
 pref("media.gmp-provider.enabled", true);
 
+// Suppress the first run page of Adblock Plus in Adblock Browser.
+pref("extensions.adblockplus.preconfigured.suppress_first_run_page", true);
+
 // The default color scheme in reader mode (light, dark, auto)
 // auto = color automatically adjusts according to ambient light level
 // (auto only works on platforms where the 'devicelight' event is enabled)