From 6662cdbeb39d9bad15efedd37cf97f5e7adff853 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 23 Apr 2018 17:21:17 +0200 Subject: Hard-code the version number for Mozilla's version checker for add-ons. --- mobile/android/app/mobile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mobile') diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 9a28bd716..c0eba6596 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -215,8 +215,8 @@ pref("extensions.hideUpdateButton", false); pref("extensions.strictCompatibility", false); pref("extensions.minCompatibleAppVersion", "11.0"); -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%¤tAppVersion=%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%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +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=52.9&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%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=52.9&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); pref("extensions.hotfix.id", "firefox-android-hotfix@mozilla.org"); pref("extensions.hotfix.cert.checkAttributes", true); -- cgit v1.2.3 From 3442ae7718679a4da8664bdbb561f746e0357203 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Wed, 2 May 2018 06:57:57 +0200 Subject: Fix unsafe "instanceof" negations https://github.com/MoonchildProductions/Pale-Moon/pull/1173 --- mobile/android/chrome/content/InputWidgetHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mobile') diff --git a/mobile/android/chrome/content/InputWidgetHelper.js b/mobile/android/chrome/content/InputWidgetHelper.js index 9c753bd7b..cf66a263e 100644 --- a/mobile/android/chrome/content/InputWidgetHelper.js +++ b/mobile/android/chrome/content/InputWidgetHelper.js @@ -63,7 +63,7 @@ var InputWidgetHelper = { }, hasInputWidget: function(aElement) { - if (!aElement instanceof HTMLInputElement) + if (!(aElement instanceof HTMLInputElement)) return false; let type = aElement.getAttribute('type'); -- cgit v1.2.3 From 4613b91ecac2745252c40be64e73de5ff920b02b Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 3 May 2018 01:24:31 +0200 Subject: Remove sandbox ductwork conditional code. --- mobile/android/installer/package-manifest.in | 5 ----- 1 file changed, 5 deletions(-) (limited to 'mobile') diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 086138d47..067f9dde1 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -502,11 +502,6 @@ ; @BINPATH@/components/pipnss.xpt -; For process sandboxing -#if defined(MOZ_SANDBOX) -@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@ -#endif - [mobile] @BINPATH@/chrome/chrome@JAREXT@ @BINPATH@/chrome/chrome.manifest -- cgit v1.2.3 From 8e08b8cef22be82dfc6f62bf8531ba3da097ef9b Mon Sep 17 00:00:00 2001 From: trav90 Date: Sat, 12 May 2018 08:18:44 -0500 Subject: Make safebrowsing optional at build time - Part 2: mobile/ --- mobile/android/chrome/content/browser.js | 8 ++++++-- mobile/android/components/MobileComponents.manifest | 2 ++ mobile/android/confvars.sh | 1 + mobile/android/installer/package-manifest.in | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) (limited to 'mobile') diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index b00e1af15..e2706f4b2 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -57,8 +57,10 @@ XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent", XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", - "resource://gre/modules/SafeBrowsing.jsm"); +#ifdef MOZ_SAFE_BROWSING + XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", + "resource://gre/modules/SafeBrowsing.jsm"); +#endif XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"); @@ -530,8 +532,10 @@ var BrowserApp = { InitLater(() => Services.search.init(), Services, "search"); InitLater(() => DownloadNotifications.init(), window, "DownloadNotifications"); +#ifdef MOZ_SAFE_BROWSING // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008. InitLater(() => SafeBrowsing.init(), window, "SafeBrowsing"); +#endif InitLater(() => Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager)); InitLater(() => LoginManagerParent.init(), window, "LoginManagerParent"); diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest index 8cf8f9a27..5194de48f 100644 --- a/mobile/android/components/MobileComponents.manifest +++ b/mobile/android/components/MobileComponents.manifest @@ -14,7 +14,9 @@ contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {322ba47e-70 #ifdef MOZ_SERVICES_HEALTHREPORT contract @mozilla.org/network/protocol/about;1?what=healthreport {322ba47e-7047-4f71-aebf-cb7d69325cd9} #endif +#ifdef MOZ_SAFE_BROWSING contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9} +#endif contract @mozilla.org/network/protocol/about;1?what=accounts {322ba47e-7047-4f71-aebf-cb7d69325cd9} contract @mozilla.org/network/protocol/about;1?what=logins {322ba47e-7047-4f71-aebf-cb7d69325cd9} diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index a804afe22..869d0332e 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -24,6 +24,7 @@ MOZ_ANDROID_APPLICATION_CLASS=org.mozilla.gecko.GeckoApplication MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp MOZ_ANDROID_SEARCH_INTENT_CLASS=org.mozilla.search.SearchActivity +MOZ_SAFE_BROWSING= MOZ_NO_SMART_CARDS=1 MOZ_XULRUNNER= diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 067f9dde1..ee5244a6d 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -417,12 +417,14 @@ ; Modules @BINPATH@/modules/* +#ifdef MOZ_SAFE_BROWSING ; Safe Browsing @BINPATH@/components/nsURLClassifier.manifest @BINPATH@/components/nsUrlClassifierHashCompleter.js @BINPATH@/components/nsUrlClassifierListManager.js @BINPATH@/components/nsUrlClassifierLib.js @BINPATH@/components/url-classifier.xpt +#endif ; Private Browsing @BINPATH@/components/privatebrowsing.xpt -- cgit v1.2.3 From 41d68e3f70b0aabc01cf9a49c43cf1aab0f4bdce Mon Sep 17 00:00:00 2001 From: trav90 Date: Sat, 12 May 2018 08:32:13 -0500 Subject: Make safebrowsing optional at build time - Part 5: preferences --- mobile/android/app/mobile.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mobile') diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index c0eba6596..ef4764d88 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -636,9 +636,11 @@ pref("media.eme.apiVisible", false); // optimize images memory usage pref("image.downscale-during-decode.enabled", true); +#ifdef MOZ_SAFE_BROWSING pref("browser.safebrowsing.downloads.enabled", false); pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@); +#endif // True if this is the first time we are showing about:firstrun pref("browser.firstrun.show.uidiscovery", true); -- cgit v1.2.3 From b70d884598e1e14b99190e1e5c349553ff59849b Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Mon, 7 May 2018 19:45:46 -0400 Subject: Initial updates for Reader View. --- mobile/android/themes/core/jar.mn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mobile') diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn index 248c00253..6bca48990 100644 --- a/mobile/android/themes/core/jar.mn +++ b/mobile/android/themes/core/jar.mn @@ -18,8 +18,6 @@ chrome.jar: skin/aboutMemory.css (aboutMemory.css) skin/aboutPrivateBrowsing.css (aboutPrivateBrowsing.css) skin/aboutReader.css (aboutReader.css) - skin/aboutReaderContent.css (aboutReaderContent.css) - skin/aboutReaderControls.css (aboutReaderControls.css) skin/aboutSupport.css (aboutSupport.css) skin/content.css (content.css) skin/scrollbar.css (scrollbar-apz.css) @@ -31,8 +29,6 @@ chrome.jar: % override chrome://global/skin/about.css chrome://browser/skin/about.css % override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css -% override chrome://global/skin/aboutReaderContent.css chrome://browser/skin/aboutReaderContent.css -% override chrome://global/skin/aboutReaderControls.css chrome://browser/skin/aboutReaderControls.css % override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css % override chrome://global/skin/netError.css chrome://browser/skin/netError.css -- cgit v1.2.3 From fcd7ee3c886c435f178230b13d0b0cb0c9c40c53 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 23 May 2018 16:31:42 +0200 Subject: Remove the Dark Matter Detector (DMD) Memeory debugger component. This resolves #376. --- mobile/android/installer/package-manifest.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'mobile') diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index ee5244a6d..ea8269776 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -29,9 +29,6 @@ #ifndef MOZ_STATIC_JS @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif -#ifdef MOZ_DMD -@BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@ -#endif #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ -- cgit v1.2.3 From ac25827a87d86f1cf9e48aab6605f77a2c89041a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 24 May 2018 14:06:04 +0200 Subject: Remove SPS profiler. - Conditionals and code blocks. (MOZ_ENABLE_PROFILER_SPS) - Stub out several profiler-only functions. --- mobile/android/installer/package-manifest.in | 6 ------ 1 file changed, 6 deletions(-) (limited to 'mobile') diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index ea8269776..188682d3b 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -174,9 +174,6 @@ @BINPATH@/components/layout_xul.xpt @BINPATH@/components/locale.xpt @BINPATH@/components/lwbrk.xpt -#ifdef MOZ_ENABLE_PROFILER_SPS -@BINPATH@/components/memory_profiler.xpt -#endif @BINPATH@/components/mimetype.xpt @BINPATH@/components/mozfind.xpt @BINPATH@/components/necko_about.xpt @@ -206,9 +203,6 @@ @BINPATH@/components/plugin.xpt @BINPATH@/components/pref.xpt @BINPATH@/components/prefetch.xpt -#ifdef MOZ_ENABLE_PROFILER_SPS -@BINPATH@/components/profiler.xpt -#endif @BINPATH@/components/rdf.xpt @BINPATH@/components/satchel.xpt @BINPATH@/components/saxparser.xpt -- cgit v1.2.3 From f786134c442da55a2a45e1422ef8530c892899b6 Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Thu, 24 May 2018 19:42:03 -0400 Subject: Remove MOZ_SOCIAL. --- mobile/android/moz.configure | 1 - 1 file changed, 1 deletion(-) (limited to 'mobile') diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 0ab0b113e..9f622f6ef 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -62,7 +62,6 @@ option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER', set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER', depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True)) -imply_option('MOZ_SOCIAL', False) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_ANDROID_HISTORY', True) -- cgit v1.2.3 From 72bab89cf6c77c9ee95a977c306e6ce317b84835 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 25 May 2018 20:45:48 +0000 Subject: Revert "Remove the Social API" --- mobile/android/moz.configure | 1 + 1 file changed, 1 insertion(+) (limited to 'mobile') diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 9f622f6ef..0ab0b113e 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -62,6 +62,7 @@ option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER', set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER', depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True)) +imply_option('MOZ_SOCIAL', False) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_ANDROID_HISTORY', True) -- cgit v1.2.3 From 5f89c3da66862d82fa27092986c4065aba3574ff Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Wed, 30 May 2018 17:45:05 -0400 Subject: Remove Social API. --- mobile/android/moz.configure | 1 - 1 file changed, 1 deletion(-) (limited to 'mobile') diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 0ab0b113e..9f622f6ef 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -62,7 +62,6 @@ option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER', set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER', depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True)) -imply_option('MOZ_SOCIAL', False) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_ANDROID_HISTORY', True) -- cgit v1.2.3 From 535e9399e6a57eafa478c26055339778f2b0c661 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 29 Jun 2018 17:40:01 +0200 Subject: Remove SSL Error Reporting telemetry --- mobile/android/installer/package-manifest.in | 5 ----- 1 file changed, 5 deletions(-) (limited to 'mobile') diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 188682d3b..af4a155a9 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -217,7 +217,6 @@ @BINPATH@/components/toolkit_finalizationwitness.xpt @BINPATH@/components/toolkit_formautofill.xpt @BINPATH@/components/toolkit_osfile.xpt -@BINPATH@/components/toolkit_securityreporter.xpt @BINPATH@/components/toolkit_perfmonitoring.xpt @BINPATH@/components/toolkit_xulstore.xpt @BINPATH@/components/toolkitprofile.xpt @@ -422,10 +421,6 @@ @BINPATH@/components/PrivateBrowsing.manifest @BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js -; Security Reports -@BINPATH@/components/SecurityReporter.manifest -@BINPATH@/components/SecurityReporter.js - ; [Browser Chrome Files] @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest -- cgit v1.2.3