Commit 163e2fae 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 43502: Move about:torconnect methods to TorConnectParent.
parent e0edfde0

browser/components/torpreferences/content/connectionPane.js

+10 −3
Changes for browser/components/torpreferences/content/connectionPane.js: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ const { TorProviderBuilder, TorProviderTopics } = ChromeUtils.importESModule( 
const { InternetStatus, TorConnect, TorConnectTopics, TorConnectStage } =

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



const { TorConnectParent } = ChromeUtils.importESModule(

  "resource://gre/actors/TorConnectParent.sys.mjs"

);



const { QRCode } = ChromeUtils.importESModule(

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

);
@@ -2261,7 +2265,7 @@ const gBridgeSettings = { 


            // Start Bootstrapping, which should use the configured bridges.

            // NOTE: We do this regardless of any previous TorConnect Error.

            TorConnect.openTorConnect({ beginBootstrapping: "hard" });

            TorConnectParent.open({ beginBootstrapping: "hard" });

          });

        },

        // closedCallback should be called after gSubDialog has already
@@ -2374,7 +2378,7 @@ const gNetworkStatus = { 
      "network-status-tor-connect-button"

    );

    this._torConnectButton.addEventListener("click", () => {

      TorConnect.openTorConnect({ beginBootstrapping: "soft" });

      TorConnectParent.open({ beginBootstrapping: "soft" });

    });



    this._updateInternetStatus();
@@ -2513,7 +2517,10 @@ const gConnectionPane = (function () { 
          TorStrings.settings.bridgeChooseForMe

        );

        chooseForMe.addEventListener("command", () => {

          TorConnect.openTorConnect({

          if (!location.value) {

            return;

          }

          TorConnectParent.open({

            beginBootstrapping: "hard",

            regionCode: location.value,

          });