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

Refactor onionshare GUI to use await_publication=True when using ephemeral onion services

Browse Source
This commit is contained in:
Micah Lee 2016-09-05 11:36:41 -07:00
parent 87761c6fce
commit b7d1a7339c
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionshare_gui/onionshare_gui.py
View File

@ -150,14 +150,14 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.status_bar.showMessage(strings._('gui_starting_server1', True)) self.status_bar.showMessage(strings._('gui_starting_server1', True))
self.app.choose_port() self.app.choose_port()
try: try:
self.app.start_onion_service(gui=True) self.app.start_onion_service()
except onionshare.onion.NoTor as e: except onionshare.onion.NoTor as e:
alert(e.args[0], QtWidgets.QMessageBox.Warning) alert(e.args[0], QtWidgets.QMessageBox.Warning)
self.server_status.stop_server() self.server_status.stop_server()
self.status_bar.clearMessage() self.status_bar.clearMessage()
return return
# start onionshare service in new thread # start onionshare http service in new thread
t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open, self.app.transparent_torification)) t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open, self.app.transparent_torification))
t.daemon = True t.daemon = True
t.start() t.start()
@ -170,7 +170,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.starting_server_step2.emit() self.starting_server_step2.emit()
# wait for hs # wait for hs
if not self.app.local_only: if not self.app.local_only and not self.app.onion.supports_ephemeral:
self.status_bar.showMessage(strings._('gui_starting_server3', True)) self.status_bar.showMessage(strings._('gui_starting_server3', True))
self.app.onion.wait_for_hs(self.app.onion_host) self.app.onion.wait_for_hs(self.app.onion_host)