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

When saving settings, if Tor settings changed or if Tor isn't connected, reboot the Onion object, so that it's always connected to Tor when using the app

Browse source
This commit is contained in:
Micah Lee 2017-05-16 16:50:33 -07:00
parent 2cc8f7de99
commit 41f4b666e7
5 changed files with 110 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
onionshare_gui/tor_connection_dialog.py
View file

@ -38,7 +38,7 @@ class TorConnectionDialog(QtWidgets.QProgressDialog):
self.settings = settings
self.onion = onion
self.setWindowTitle("OnionShare")
self.setWindowTitle("OnionShare TOR")
self.setWindowIcon(QtGui.QIcon(common.get_resource_path('images/logo.png')))
self.setModal(True)
self.setFixedSize(400, 150)
@ -88,20 +88,23 @@ class TorConnectionDialog(QtWidgets.QProgressDialog):
self.active = False
# Cancel connecting to Tor
self.cancel()
QtCore.QTimer.singleShot(1, self.cancel)
def _error_connecting_to_tor(self, msg):
common.log('TorConnectionDialog', '_error_connecting_to_tor')
self.active = False
def alert_and_open_settings():
# Display the exception in an alert box
Alert("{}\n\n{}".format(msg, strings._('gui_tor_connection_error_settings', True)), QtWidgets.QMessageBox.Warning)
# Open settings
self.open_settings.emit()
QtCore.QTimer.singleShot(1, alert_and_open_settings)
# Cancel connecting to Tor
self.cancel()
# Display the exception in an alert box
Alert("{}\n\n{}".format(msg, strings._('gui_tor_connection_error_settings', True)), QtWidgets.QMessageBox.Warning)
# Open settings
self.open_settings.emit()
QtCore.QTimer.singleShot(1, self.cancel)
class TorConnectionThread(QtCore.QThread):
tor_status_update = QtCore.pyqtSignal(str, str)
@ -126,11 +129,11 @@ class TorConnectionThread(QtCore.QThread):
if self.onion.connected_to_tor:
self.connected_to_tor.emit()
else:
self.error_connecting_to_tor.emit(strings._('settings_error_unknown_error', True))
self.canceled_connecting_to_tor.emit()
except BundledTorCanceled as e:
common.log('TorConnectionThread', 'run', 'caught exception: BundledTorCanceled')
self.canceled_connecting_to_tor.emit(strings._('settings_error_bundled_tor_canceled'))
self.canceled_connecting_to_tor.emit()
except Exception as e:
common.log('TorConnectionThread', 'run', 'caught exception: {}'.format(e.args[0]))