diff options
| author | Micah Lee <micah@micahflee.com> | 2019-11-02 17:06:13 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-11-02 17:06:13 -0700 |
| commit | b815b0e9e2853f14a2bb07ce0782b3f21d355c23 (patch) | |
| tree | b9cb1ce0b860d0aa530c507f9ed47351c2aa815a /onionshare | |
| parent | 87918c5d89f26bce515879895ed0a4ae736dbd2a (diff) | |
| download | onionshare-b815b0e9e2853f14a2bb07ce0782b3f21d355c23.tar.gz onionshare-b815b0e9e2853f14a2bb07ce0782b3f21d355c23.zip | |
Remove mode settings from global settings object
Diffstat (limited to 'onionshare')
| -rw-r--r-- | onionshare/mode_settings.py | 4 | ||||
| -rw-r--r-- | onionshare/settings.py | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/onionshare/mode_settings.py b/onionshare/mode_settings.py index dfc0b939..9caf6345 100644 --- a/onionshare/mode_settings.py +++ b/onionshare/mode_settings.py @@ -45,7 +45,7 @@ class ModeSettings: "client_auth": False, }, "share": {"autostop_sharing": True}, - "receive": {"data_dir": self.build_default_data_dir()}, + "receive": {"data_dir": self.build_default_receive_data_dir()}, "website": {"disable_csp": False}, } @@ -55,7 +55,7 @@ class ModeSettings: def set(self, group, key, val): self.settings[group][key] = val - def build_default_data_dir(self): + def build_default_receive_data_dir(self): """ Returns the path of the default Downloads directory for receive mode. """ diff --git a/onionshare/settings.py b/onionshare/settings.py index 6d6528a4..11227817 100644 --- a/onionshare/settings.py +++ b/onionshare/settings.py @@ -106,24 +106,12 @@ class Settings(object): "socket_file_path": "/var/run/tor/control", "auth_type": "no_auth", "auth_password": "", - "close_after_first_download": True, - "autostop_timer": False, - "autostart_timer": False, - "use_stealth": False, "use_autoupdate": True, "autoupdate_timestamp": None, "no_bridges": True, "tor_bridges_use_obfs4": False, "tor_bridges_use_meek_lite_azure": False, "tor_bridges_use_custom_bridges": "", - "use_legacy_v2_onions": False, - "save_private_key": False, - "private_key": "", - "public_mode": False, - "password": "", - "hidservauth_string": "", - "data_dir": "", - "csp_header_disabled": False, "locale": None, # this gets defined in fill_in_defaults() } self._settings = {} |