This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser.
commit ef0f0ae9f0e567c4ad18a6a594a7e510fb5b20b3 Author: WofWca wofwca@protonmail.com AuthorDate: Tue Jul 26 13:26:00 2022 +0300
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
improvement: adjust bridge settings change logic
Now that we don't call these callbacks unless "accept" was pressed, the logic can be adjusted accordingly
Co-authored-by: Pier Angelo Vendrame pierov@torproject.org --- browser/components/torpreferences/content/connectionPane.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index eadd4e6037f4d..dd15bca7bf13c 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -1066,8 +1066,6 @@ const gConnectionPane = (function() { TorSettings.applySettings().then(result => { this._populateBridgeCards(); }); - } else { - TorSettings.bridges.enabled = false; } }); requestBridgeDialog.openDialog(gSubDialog); @@ -1079,14 +1077,15 @@ const gConnectionPane = (function() { TorSettings.bridges.enabled = true; TorSettings.bridges.source = TorBridgeSource.UserProvided; TorSettings.bridges.bridge_strings = aBridgeString; - TorSettings.saveToPrefs(); - TorSettings.applySettings().then(result => { - this._populateBridgeCards(); - }); } else { TorSettings.bridges.enabled = false; TorSettings.bridges.source = TorBridgeSource.Invalid; + TorSettings.bridges.bridge_strings = ""; } + TorSettings.saveToPrefs(); + TorSettings.applySettings().then(result => { + this._populateBridgeCards(); + }); }); provideBridgeDialog.openDialog(gSubDialog); },