[tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser


Commits:
9bdd279c by Pier Angelo Vendrame at 2023-03-29T20:21:32+02:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Bug 41704: Immediately return on remoteSettings.pollChanges

- - - - -


2 changed files:

- services/settings/remote-settings.js
- services/settings/servicesSettings.manifest


Changes:

=====================================
services/settings/remote-settings.js
=====================================
@@ -200,12 +200,17 @@ function remoteSettingsFunction() {
     full = false,
   } = {}) => {
     // When running in full mode, we ignore last polling status.
-    if (full) {
+    if (full || AppConstants.BASE_BROWSER_VERSION) {
       gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF);
       gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE);
       gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG);
     }
 
+    if (AppConstants.BASE_BROWSER_VERSION) {
+      // tor-browser#41704: pollChanges is always online, so do not allow it.
+      return;
+    }
+
     let pollTelemetryArgs = {
       source: TELEMETRY_SOURCE_POLL,
       trigger,


=====================================
services/settings/servicesSettings.manifest
=====================================
@@ -4,4 +4,4 @@ resource services-settings resource://gre/modules/services-settings/
 # Schedule polling of remote settings changes
 # (default 24H, max 72H)
 # see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155
-category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200
+# category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9bdd279ca0e41c3faec9da367f2ee971ceefa5f0

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9bdd279ca0e41c3faec9da367f2ee971ceefa5f0
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230329/13ca04fb/attachment-0001.htm>