Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-08 18:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove obsolete censorship circumvention settings option in the TorSettingsTab

Browse Source
This commit is contained in:
Miguel Jacq 2021-12-14 11:15:26 +11:00
parent 89894fe9fe
commit 28786f5a63
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/src/onionshare/resources/locale/en.json
View File

@ -74,7 +74,6 @@
"gui_settings_tor_bridges": "Connect using a Tor bridge?", "gui_settings_tor_bridges": "Connect using a Tor bridge?",
"gui_settings_tor_bridges_label": "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.", "gui_settings_tor_bridges_label": "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.",
"gui_settings_bridge_use_checkbox": "Use a bridge", "gui_settings_bridge_use_checkbox": "Use a bridge",
"gui_settings_censorship_circumvention_checkbox": "Attempt to automatically find a bridge based on your country if Tor fails to connect",
"gui_settings_bridge_radio_builtin": "Select a built-in bridge", "gui_settings_bridge_radio_builtin": "Select a built-in bridge",
"gui_settings_bridge_none_radio_option": "Don't use a bridge", "gui_settings_bridge_none_radio_option": "Don't use a bridge",
"gui_settings_meek_lite_expensive_warning": "Warning: The meek-azure bridges are very costly for the Tor Project to run.<br><br>Only use them if unable to connect to Tor directly, via obfs4 transports, or other normal bridges.", "gui_settings_meek_lite_expensive_warning": "Warning: The meek-azure bridges are very costly for the Tor Project to run.<br><br>Only use them if unable to connect to Tor directly, via obfs4 transports, or other normal bridges.",

21
desktop/src/onionshare/tor_settings_tab.py
View File

@ -93,12 +93,6 @@ class TorSettingsTab(QtWidgets.QWidget):
self.bridge_use_checkbox.stateChanged.connect( self.bridge_use_checkbox.stateChanged.connect(
self.bridge_use_checkbox_state_changed self.bridge_use_checkbox_state_changed
) )
self.censorship_circumvention_checkbox = QtWidgets.QCheckBox(
strings._("gui_settings_censorship_circumvention_checkbox")
)
self.censorship_circumvention_checkbox.stateChanged.connect(
self.censorship_circumvention_checkbox_state_changed
)
# Built-in bridge # Built-in bridge
self.bridge_builtin_radio = QtWidgets.QRadioButton( self.bridge_builtin_radio = QtWidgets.QRadioButton(
@ -172,7 +166,6 @@ class TorSettingsTab(QtWidgets.QWidget):
bridges_layout = QtWidgets.QVBoxLayout() bridges_layout = QtWidgets.QVBoxLayout()
bridges_layout.addWidget(bridges_label) bridges_layout.addWidget(bridges_label)
bridges_layout.addWidget(self.bridge_use_checkbox) bridges_layout.addWidget(self.bridge_use_checkbox)
bridges_layout.addWidget(self.censorship_circumvention_checkbox)
bridges_layout.addWidget(self.bridge_settings) bridges_layout.addWidget(self.bridge_settings)
self.bridges = QtWidgets.QWidget() self.bridges = QtWidgets.QWidget()
@ -458,7 +451,6 @@ class TorSettingsTab(QtWidgets.QWidget):
if self.old_settings.get("bridges_enabled"): if self.old_settings.get("bridges_enabled"):
self.bridge_use_checkbox.setCheckState(QtCore.Qt.Checked) self.bridge_use_checkbox.setCheckState(QtCore.Qt.Checked)
self.censorship_circumvention_checkbox.setCheckState(QtCore.Qt.Checked)
self.bridge_settings.show() self.bridge_settings.show()
bridges_type = self.old_settings.get("bridges_type") bridges_type = self.old_settings.get("bridges_type")
@ -541,16 +533,6 @@ class TorSettingsTab(QtWidgets.QWidget):
else: else:
self.bridge_settings.hide() self.bridge_settings.hide()
def censorship_circumvention_checkbox_state_changed(self, state):
"""
'Allow censorship circumvention (automatic bridges)' checkbox changed
"""
# Turning on censorship circumvention through the act of
# automatic bridge selection, implicitly means enabling
# bridges.
if state == QtCore.Qt.Checked:
self.bridge_use_checkbox.setCheckState(QtCore.Qt.Checked)
def bridge_builtin_radio_toggled(self, checked): def bridge_builtin_radio_toggled(self, checked):
""" """
'Select a built-in bridge' radio button toggled 'Select a built-in bridge' radio button toggled
@ -860,9 +842,6 @@ class TorSettingsTab(QtWidgets.QWidget):
if self.bridge_use_checkbox.checkState() == QtCore.Qt.Checked: if self.bridge_use_checkbox.checkState() == QtCore.Qt.Checked:
settings.set("bridges_enabled", True) settings.set("bridges_enabled", True)
if self.censorship_circumvention_checkbox.checkState() == QtCore.Qt.Checked:
settings.set("censorship_circumvention", True)
if self.bridge_builtin_radio.isChecked(): if self.bridge_builtin_radio.isChecked():
settings.set("bridges_type", "built-in") settings.set("bridges_type", "built-in")