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

Remove all references to old settings

Browse Source
This commit is contained in:
Micah Lee 2021-10-26 21:07:38 -07:00
parent 2b3b6d7635
commit 9515fe6aaf
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/onionshare_cli/onion.py
View File

@ -424,11 +424,7 @@ class Onion(object):
time.sleep(0.2) time.sleep(0.2)
# If using bridges, it might take a bit longer to connect to Tor # If using bridges, it might take a bit longer to connect to Tor
if ( if self.settings.get("bridges_enabled"):
self.settings.get("tor_bridges_use_custom_bridges")
or self.settings.get("tor_bridges_use_obfs4")
or self.settings.get("tor_bridges_use_meek_lite_azure")
):
# Only override timeout if a custom timeout has not been passed in # Only override timeout if a custom timeout has not been passed in
if connect_timeout == 120: if connect_timeout == 120:
connect_timeout = 150 connect_timeout = 150

4
cli/tests/test_cli_settings.py
View File

@ -141,10 +141,10 @@ class TestSettings:
def test_set_custom_bridge(self, settings_obj): def test_set_custom_bridge(self, settings_obj):
settings_obj.set( settings_obj.set(
"tor_bridges_use_custom_bridges", "bridges_custom",
"Bridge 45.3.20.65:9050 21300AD88890A49C429A6CB9959CFD44490A8F6E", "Bridge 45.3.20.65:9050 21300AD88890A49C429A6CB9959CFD44490A8F6E",
) )
assert ( assert (
settings_obj._settings["tor_bridges_use_custom_bridges"] settings_obj._settings["bridges_custom"]
== "Bridge 45.3.20.65:9050 21300AD88890A49C429A6CB9959CFD44490A8F6E" == "Bridge 45.3.20.65:9050 21300AD88890A49C429A6CB9959CFD44490A8F6E"
) )