Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-29 16:57:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

#493, #500 - detect if the Tor connection (bundled, TorBrowser or otherwise) has been lost while the app is open. Stop a running share if so

Browse source
This commit is contained in:
Miguel Jacq 2017-12-21 09:22:53 +11:00
parent d7190497cb
commit 6e64f08f08
3 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
onionshare_gui/onionshare_gui.py
View file

@ -219,6 +219,11 @@ class OnionShareGui(QtWidgets.QMainWindow):
def reload_settings():
common.log('OnionShareGui', 'open_settings', 'settings have changed, reloading')
self.settings.load()
# We might've stopped the main requests timer if a Tor connection failed.
# If we've reloaded settings, we probably succeeded in obtaining a new
# connection. If so, restart the timer.
if not self.timer.isActive():
self.timer.start()
d = SettingsDialog(self.onion, self.qtapp, self.config)
d.settings_saved.connect(reload_settings)
@ -389,6 +394,18 @@ class OnionShareGui(QtWidgets.QMainWindow):
"""
self.update()
# Have we lost connection to Tor somehow?
try:
# Tor Browser may not even have been open when we started OnionShare,
# in which case onion.is_authenticated() throws a NoneType error
self.onion
if not self.onion.is_authenticated():
self.timer.stop()
self.start_server_error(strings._('error_tor_protocol_error'))
self._tor_connection_canceled()
except:
pass
# scroll to the bottom of the dl progress bar log pane
# if a new download has been added
if self.new_download: