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

Make UpdateChecker use signals and slots to communicate tor status messages. And make the latest version http request differentiate between automatic requests and forced requests

Browse source
This commit is contained in:
Micah Lee 2017-04-17 13:03:16 -07:00
parent dc1418cc3b
commit da70c71d8a
2 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
onionshare_gui/settings_dialog.py
View file

@ -347,7 +347,7 @@ class SettingsDialog(QtWidgets.QDialog):
if settings.get('connection_type') == 'bundled':
self.tor_status.show()
self._disable_buttons()
bundled_tor_func = self._bundled_tor_func
bundled_tor_func = self._tor_status_update
else:
bundled_tor_func = None
@ -372,14 +372,6 @@ class SettingsDialog(QtWidgets.QDialog):
settings = Settings()
settings.load()
# Show Tor connection status if connection type is bundled tor
if settings.get('connection_type') == 'bundled':
self.tor_status.show()
self._disable_buttons()
bundled_tor_func = self._bundled_tor_func
else:
bundled_tor_func = None
# Check for updates
def update_available(update_url, installed_version, latest_version):
Alert(strings._("update_available", True).format(update_url, installed_version, latest_version))
@ -390,8 +382,14 @@ class SettingsDialog(QtWidgets.QDialog):
u.update_available.connect(update_available)
u.update_not_available.connect(update_not_available)
# Show Tor connection status if connection type is bundled tor
if settings.get('connection_type') == 'bundled':
self.tor_status.show()
self._disable_buttons()
u.tor_status_update.connect(self._tor_status_update)
try:
u.check(force=True, bundled_tor_func=bundled_tor_func)
u.check(force=True)
except UpdateCheckerTorError:
Alert(strings._('update_error_tor', True), QtWidgets.QMessageBox.Warning)
except UpdateCheckerSOCKSHTTPError:
@ -466,7 +464,7 @@ class SettingsDialog(QtWidgets.QDialog):
last_checked = strings._('gui_settings_autoupdate_timestamp_never', True)
self.autoupdate_timestamp.setText(strings._('gui_settings_autoupdate_timestamp', True).format(last_checked))
def _bundled_tor_func(self, message):
def _tor_status_update(self, message):
self.tor_status.setText('<strong>{}</strong><br>{}'.format(strings._('connecting_to_tor', True), message))
self.qtapp.processEvents()
if 'Done' in message: