diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json index e26188bf..912c1d27 100644 --- a/desktop/src/onionshare/resources/locale/en.json +++ b/desktop/src/onionshare/resources/locale/en.json @@ -74,7 +74,6 @@ "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_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_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.

Only use them if unable to connect to Tor directly, via obfs4 transports, or other normal bridges.", diff --git a/desktop/src/onionshare/tor_settings_tab.py b/desktop/src/onionshare/tor_settings_tab.py index cf30d320..5ffea747 100644 --- a/desktop/src/onionshare/tor_settings_tab.py +++ b/desktop/src/onionshare/tor_settings_tab.py @@ -93,12 +93,6 @@ class TorSettingsTab(QtWidgets.QWidget): self.bridge_use_checkbox.stateChanged.connect( 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 self.bridge_builtin_radio = QtWidgets.QRadioButton( @@ -172,7 +166,6 @@ class TorSettingsTab(QtWidgets.QWidget): bridges_layout = QtWidgets.QVBoxLayout() bridges_layout.addWidget(bridges_label) bridges_layout.addWidget(self.bridge_use_checkbox) - bridges_layout.addWidget(self.censorship_circumvention_checkbox) bridges_layout.addWidget(self.bridge_settings) self.bridges = QtWidgets.QWidget() @@ -458,7 +451,6 @@ class TorSettingsTab(QtWidgets.QWidget): if self.old_settings.get("bridges_enabled"): self.bridge_use_checkbox.setCheckState(QtCore.Qt.Checked) - self.censorship_circumvention_checkbox.setCheckState(QtCore.Qt.Checked) self.bridge_settings.show() bridges_type = self.old_settings.get("bridges_type") @@ -541,16 +533,6 @@ class TorSettingsTab(QtWidgets.QWidget): else: 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): """ '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: 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(): settings.set("bridges_type", "built-in")