Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
- 
285a88a1
by Pier Angelo Vendrame at 2023-03-29T19:46:17+02:00
2 changed files:
Changes:
| ... | ... | @@ -200,12 +200,17 @@ function remoteSettingsFunction() { | 
| 200 | 200 |      full = false,
 | 
| 201 | 201 |    } = {}) => {
 | 
| 202 | 202 |      // When running in full mode, we ignore last polling status.
 | 
| 203 | -    if (full) {
 | |
| 203 | +    if (full || AppConstants.BASE_BROWSER_VERSION) {
 | |
| 204 | 204 |        gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF);
 | 
| 205 | 205 |        gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE);
 | 
| 206 | 206 |        gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG);
 | 
| 207 | 207 |      }
 | 
| 208 | 208 | |
| 209 | +    if (AppConstants.BASE_BROWSER_VERSION) {
 | |
| 210 | +      // tor-browser#41704: pollChanges is always online, so do not allow it.
 | |
| 211 | +      return;
 | |
| 212 | +    }
 | |
| 213 | + | |
| 209 | 214 |      let pollTelemetryArgs = {
 | 
| 210 | 215 |        source: TELEMETRY_SOURCE_POLL,
 | 
| 211 | 216 |        trigger,
 | 
| ... | ... | @@ -4,4 +4,4 @@ resource services-settings resource://gre/modules/services-settings/ | 
| 4 | 4 |  # Schedule polling of remote settings changes
 | 
| 5 | 5 |  # (default 24H, max 72H)
 | 
| 6 | 6 |  # see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155
 | 
| 7 | -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 | |
| 7 | +# category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 |