[tbb-commits] [tor-browser] branch tor-browser-91.9.0esr-11.5-1 updated: fixup! fixup! squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser

[gitolite role]

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.

The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push:
     new 167ae51dd073e fixup! fixup! squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser
167ae51dd073e is described below

commit 167ae51dd073ee25b17449a39a3443253dca5e22
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Thu May 19 13:11:19 2022 +0200

    fixup! fixup! squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser
---
 browser/components/torconnect/TorConnectParent.jsm       | 3 +++
 browser/components/torconnect/content/aboutTorConnect.js | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm
index a39f7a07a0ade..cf3c1233dd622 100644
--- a/browser/components/torconnect/TorConnectParent.jsm
+++ b/browser/components/torconnect/TorConnectParent.jsm
@@ -38,6 +38,7 @@ class TorConnectParent extends JSWindowActorParent {
       InternetStatus: TorConnect.internetStatus,
       DetectedLocation: TorConnect.detectedLocation,
       ShowViewLog: TorConnect.logHasWarningOrError,
+      HasBootsrapEverFailed: TorConnect.hasBootstrapEverFailed,
       QuickStartEnabled: TorSettings.quickstart.enabled,
       UIState: TorConnect.uiState,
     };
@@ -66,6 +67,8 @@ class TorConnectParent extends JSWindowActorParent {
               self.state.ErrorMessage = null;
               self.state.ErrorDetails = null;
             }
+            self.state.HasBootsrapEverFailed =
+              TorConnect.hasBootstrapEverFailed;
             break;
           }
           case TorConnectTopics.BootstrapProgress: {
diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js
index bafbe7c7eeb43..6b33442c7d02b 100644
--- a/browser/components/torconnect/content/aboutTorConnect.js
+++ b/browser/components/torconnect/content/aboutTorConnect.js
@@ -145,7 +145,6 @@ class AboutTorConnect {
     allowAutomaticLocation: true,
     selectedLocation: "automatic",
     bootstrapCause: UIStates.ConnectToTor,
-    bootstrapEverAttempted: false,
   };
 
   locations = {};
@@ -505,12 +504,10 @@ class AboutTorConnect {
     this.setTitle(title, "");
     this.showConfigureConnectionLink(description);
     this.setProgress("", showProgressbar, state.BootstrapProgress);
-    if (this.uiState.bootstrapEverAttempted) {
+    if (state.HasBootsrapEverFailed) {
       this.setBreadcrumbsStatus(...breadcrumbs);
     } else {
       this.hideBreadcrumbs();
-      this.uiState.bootstrapEverAttempted = true;
-      this.saveUIState();
     }
     this.hideButtons();
     if (state.ShowViewLog) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.