Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-10 07:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ensure we don't consider the Tor connection 'lost' if we're still in the connection dialog process (wait for that thread to finish).

Browse source 
Also various implementations of onion.is_authenticated() for a more robust check than onion.connected_to_tor,
which seemed to help some corner cases
This commit is contained in:
Miguel Jacq 2017-12-21 12:15:17 +11:00
parent bcd4363769
commit b442b5d41b
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
4 changed files with 42 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

24
onionshare_gui/onionshare_gui.py
View file

@ -142,10 +142,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.set_server_active(False)
# Start the "Connecting to Tor" dialog, which calls onion.connect()
tor_con = TorConnectionDialog(self.qtapp, self.settings, self.onion)
tor_con.canceled.connect(self._tor_connection_canceled)
tor_con.open_settings.connect(self._tor_connection_open_settings)
tor_con.start()
self.tor_con = TorConnectionDialog(self.qtapp, self.settings, self.onion)
self.tor_con.canceled.connect(self._tor_connection_canceled)
self.tor_con.open_settings.connect(self._tor_connection_open_settings)
self.tor_con.start()
# After connecting to Tor, check for updates
self.check_for_updates()
@ -394,17 +394,11 @@ 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
# Has the Tor Connection dialog finished, but we've since lost connection to Tor somehow?
if not self.onion.is_authenticated() and self.tor_con.t.isFinished():
self.timer.stop()
self.start_server_error(strings._('error_tor_protocol_error'))
self._tor_connection_canceled()
# scroll to the bottom of the dl progress bar log pane
# if a new download has been added