summaryrefslogtreecommitdiff
path: root/onionshare
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2019-09-01 21:22:59 -0700
committerMicah Lee <micah@micahflee.com>2019-09-01 21:22:59 -0700
commit877a73ab59e6903dcd3c56ee85d6136db5ea3bb3 (patch)
treeb6a415afe42baff4f167d671c36906b86c5fc367 /onionshare
parentd7a7538686e6b24aef7bae15d90b165df0bbf84c (diff)
downloadonionshare-877a73ab59e6903dcd3c56ee85d6136db5ea3bb3.tar.gz
onionshare-877a73ab59e6903dcd3c56ee85d6136db5ea3bb3.zip
Remove the "Allow downloading individual files" setting altogether, and make it just automatically enabled if "Stop sharing..." is disabled
Diffstat (limited to 'onionshare')
-rw-r--r--onionshare/settings.py1
-rw-r--r--onionshare/web/share_mode.py5
2 files changed, 2 insertions, 4 deletions
diff --git a/onionshare/settings.py b/onionshare/settings.py
index d76e4855..762c6dc2 100644
--- a/onionshare/settings.py
+++ b/onionshare/settings.py
@@ -98,7 +98,6 @@ class Settings(object):
'auth_type': 'no_auth',
'auth_password': '',
'close_after_first_download': True,
- 'share_allow_downloading_individual_files': True,
'autostop_timer': False,
'autostart_timer': False,
'use_stealth': False,
diff --git a/onionshare/web/share_mode.py b/onionshare/web/share_mode.py
index c3066a03..b478fbd4 100644
--- a/onionshare/web/share_mode.py
+++ b/onionshare/web/share_mode.py
@@ -16,9 +16,8 @@ class ShareModeWeb(SendBaseModeWeb):
"""
def init(self):
self.common.log('ShareModeWeb', 'init')
- # If "Stop sharing after files have been sent" is unchecked and "Allow downloading of individual files" is checked
- self.download_individual_files = not self.common.settings.get('close_after_first_download') \
- and self.common.settings.get('share_allow_downloading_individual_files')
+ # Allow downloading individual files if "Stop sharing after files have been sent" is unchecked
+ self.download_individual_files = not self.common.settings.get('close_after_first_download')
def define_routes(self):
"""