phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 03:37:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Need to reconnect to Tor with the curr_settings Settings object after obtaining new bridges

Browse source
This commit is contained in:
Miguel Jacq 2021-12-14 14:57:01 +11:00
parent 04efd3fc0e
commit 12b725e821
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/onionshare_cli/censorship.py
View file

@ -230,6 +230,11 @@ class CensorshipCircumvention(object):
# selected the built-in bridges for a specific PT themselves. # selected the built-in bridges for a specific PT themselves.
# #
if bridge_source == "builtin": if bridge_source == "builtin":
self.common.log(
"CensorshipCircumvention",
"save_settings",
"Will be using built-in bridges",
)
self.settings.set("bridges_type", "built-in") self.settings.set("bridges_type", "built-in")
if bridge_type == "obfs4": if bridge_type == "obfs4":
self.settings.set("bridges_builtin_pt", "obfs4") self.settings.set("bridges_builtin_pt", "obfs4")
@ -239,6 +244,11 @@ class CensorshipCircumvention(object):
self.settings.set("bridges_builtin_pt", "meek-azure") self.settings.set("bridges_builtin_pt", "meek-azure")
bridges_ok = True bridges_ok = True
else: else:
self.common.log(
"CensorshipCircumvention",
"save_settings",
"Will be using custom bridges",
)
# Any other type of bridge we can treat as custom. # Any other type of bridge we can treat as custom.
self.settings.set("bridges_type", "custom") self.settings.set("bridges_type", "custom")

2
desktop/src/onionshare/connection_tab.py
View file

@ -159,7 +159,7 @@ class AutoConnectTab(QtWidgets.QWidget):
) )
self.active = False self.active = False
self.tor_con.show() self.tor_con.show()
self.tor_con.start() self.tor_con.start(self.curr_settings)
def _got_no_bridges(self): def _got_no_bridges(self):
self.use_bridge_widget.progress.hide() self.use_bridge_widget.progress.hide()