Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-24 23:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only show bridge error if connection type is bundled

Browse Source
This commit is contained in:
Micah Lee 2021-10-24 20:03:19 -07:00
parent f784870c76
commit e6c7cc989f
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/onionshare_cli/onion.py
View File

@ -199,8 +199,6 @@ class Onion(object):
) )
return return
self.common.log("Onion", "connect")
# Either use settings that are passed in, or use them from common # Either use settings that are passed in, or use them from common
if custom_settings: if custom_settings:
self.settings = custom_settings self.settings = custom_settings
@ -211,6 +209,12 @@ class Onion(object):
self.common.load_settings() self.common.load_settings()
self.settings = self.common.settings self.settings = self.common.settings
self.common.log(
"Onion",
"connect",
f"connection_type={self.settings.get('connection_type')}",
)
# The Tor controller # The Tor controller
self.c = None self.c = None

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

@ -799,7 +799,10 @@ class TorSettingsTab(QtWidgets.QWidget):
settings.set("tor_bridges_use_moat", True) settings.set("tor_bridges_use_moat", True)
moat_bridges = self.bridge_moat_textbox.toPlainText() moat_bridges = self.bridge_moat_textbox.toPlainText()
if moat_bridges.strip() == "": if (
self.connection_type_bundled_radio.isChecked()
and moat_bridges.strip() == ""
):
self.error_label.setText( self.error_label.setText(
strings._("gui_settings_moat_bridges_invalid") strings._("gui_settings_moat_bridges_invalid")
) )