This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser.
commit fa3f15cf50d13c7ae72caee416b71c8058ffa3eb Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Apr 8 15:23:55 2022 +0200
fixup! squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 40882: fixed a typo that prevented reload on about:torconnect from working --- browser/components/torconnect/TorConnectParent.jsm | 17 +++++++++++------ .../components/torconnect/content/aboutTorConnect.js | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm index dd3d1b2410f95..479446898e115 100644 --- a/browser/components/torconnect/TorConnectParent.jsm +++ b/browser/components/torconnect/TorConnectParent.jsm @@ -4,9 +4,12 @@ var EXPORTED_SYMBOLS = ["TorConnectParent"];
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); -const { TorConnect, TorConnectTopics, TorConnectState, TorCensorshipLevel } = ChromeUtils.import( - "resource:///modules/TorConnect.jsm" -); +const { + TorConnect, + TorConnectTopics, + TorConnectState, + TorCensorshipLevel, +} = ChromeUtils.import("resource:///modules/TorConnect.jsm"); const { TorSettings, TorSettingsTopics, TorSettingsData } = ChromeUtils.import( "resource:///modules/TorSettings.jsm" ); @@ -24,7 +27,7 @@ class TorConnectParent extends JSWindowActorParent {
this.state = { State: TorConnect.state, - DetectedCensorshiplevel: TorConnect.detectedCensorshiplevel, + DetectedCensorshipLevel: TorConnect.detectedCensorshipLevel, StateChanged: false, ErrorMessage: TorConnect.errorMessage, ErrorDetails: TorConnect.errorDetails, @@ -73,10 +76,12 @@ class TorConnectParent extends JSWindowActorParent { case TorConnectTopics.BootstrapError: { self.state.ErrorMessage = obj.message; self.state.ErrorDetails = obj.details; - self.state.DetectedCensorshiplevel = obj.censorshipLevel; + self.state.DetectedCensorshipLevel = obj.censorshipLevel;
// With severe censorshp, we offer user list of countries to try - if (self.state.DetectedCensorshiplevel == TorCensorshipLevel.Severe) { + if ( + self.state.DetectedCensorshipLevel == TorCensorshipLevel.Severe + ) { self.state.CountryCodes = TorConnect.countryCodes; }
diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index efea3c237470e..eb691444e4d26 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -346,7 +346,7 @@ class AboutTorConnect { this.hideButtons();
if (hasError) { - switch (state.DetectedCensorshiplevel) { + switch (state.DetectedCensorshipLevel) { case TorCensorshipLevel.None: // we shouldn't be able to get here break; @@ -387,7 +387,7 @@ class AboutTorConnect { update_AutoBootstrapping(state) { const showProgressbar = true;
- if (state.DetectedCensorshiplevel >= TorCensorshipLevel.Severe) { + if (state.DetectedCensorshipLevel >= TorCensorshipLevel.Severe) { this.setTitle(TorStrings.torConnect.tryingBridgeAgain, ""); } else { this.setTitle(TorStrings.torConnect.tryingBridge, "");