Verified Commit b280a5a1 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in... 

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

TB 41921: Also show the "Connect" button for bridge dialogs when we have
an ongoing bootstrap attempt.

With the new behaviour, changing the settings while not bootstrapped
will cancel any ongoing bootstrap. Therefore, we can start a new
bootstrap using the new settings.
parent 86943895

browser/components/torpreferences/content/builtinBridgeDialog.js

+3 −4
Original line number Diff line number Diff line
@@ -4,9 +4,8 @@ const { TorSettings, TorBridgeSource } = ChromeUtils.importESModule( 
  "resource://gre/modules/TorSettings.sys.mjs"

);



const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule(

  "resource://gre/modules/TorConnect.sys.mjs"

);

const { TorConnect, TorConnectStage, TorConnectTopics } =

  ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs");



const gBuiltinBridgeDialog = {

  init() {
@@ -96,7 +95,7 @@ const gBuiltinBridgeDialog = { 
  },



  onAcceptStateChange() {

    const connect = TorConnect.canBeginBootstrap;

    const connect = TorConnect.stageName !== TorConnectStage.Bootstrapped;

    this._result.connect = connect;

    this._acceptButton.setAttribute(

      "data-l10n-id",

browser/components/torpreferences/content/connectionPane.js

+2 −0
Original line number Diff line number Diff line
@@ -2257,6 +2257,8 @@ const gBridgeSettings = { 
          }



          // Wait until the settings are applied before bootstrapping.

          // NOTE: Saving the settings should also cancel any existing bootstrap

          // attempt first. See tor-browser#41921.

          savedSettings.then(() => {

            // The bridge dialog button is "connect" when Tor is not

            // bootstrapped, so do the connect.

browser/components/torpreferences/content/provideBridgeDialog.js

+3 −4
Original line number Diff line number Diff line
@@ -3,9 +3,8 @@ 
const { TorSettings, TorBridgeSource, validateBridgeLines } =

  ChromeUtils.importESModule("resource://gre/modules/TorSettings.sys.mjs");



const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule(

  "resource://gre/modules/TorConnect.sys.mjs"

);

const { TorConnect, TorConnectStage, TorConnectTopics } =

  ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs");



const { TorParsers } = ChromeUtils.importESModule(

  "resource://gre/modules/TorParsers.sys.mjs"
@@ -190,7 +189,7 @@ const gProvideBridgeDialog = { 
        "user-provide-bridge-dialog-next-button"

      );

    } else {

      connect = TorConnect.canBeginBootstrap;

      connect = TorConnect.stageName !== TorConnectStage.Bootstrapped;

      this._acceptButton.setAttribute(

        "data-l10n-id",

        connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept"

browser/components/torpreferences/content/requestBridgeDialog.js

+3 −4
Original line number Diff line number Diff line
@@ -4,9 +4,8 @@ const { BridgeDB } = ChromeUtils.importESModule( 
  "resource://gre/modules/BridgeDB.sys.mjs"

);



const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule(

  "resource://gre/modules/TorConnect.sys.mjs"

);

const { TorConnect, TorConnectStage, TorConnectTopics } =

  ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs");



const log = console.createInstance({

  maxLogLevel: "Warn",
@@ -102,7 +101,7 @@ const gRequestBridgeDialog = { 
  },



  onAcceptStateChange() {

    const connect = TorConnect.canBeginBootstrap;

    const connect = TorConnect.stageName !== TorConnectStage.Bootstrapped;

    this._result.connect = connect;

    this._submitButton.setAttribute(

      "data-l10n-id",