Refactor UpdateChecker into a class that's a QObject, and make it use signals and slots to communicate

onionshare_gui/settings_dialog.py

@@ -381,9 +381,17 @@ class SettingsDialog(QtWidgets.QDialog):
             bundled_tor_func = None
 
         # Check for updates
-        try:
+        def update_available(update_url, installed_version, latest_version):
-            if not check_for_updates(force=True, bundled_tor_func=bundled_tor_func):
+            Alert(strings._("update_available", True).format(update_url, installed_version, latest_version))
+        def update_not_available():
             Alert(strings._('update_not_available', True))
+
+        u = UpdateChecker()
+        u.update_available.connect(update_available)
+        u.update_not_available.connect(update_not_available)
+
+        try:
+            u.check(force=True, bundled_tor_func=bundled_tor_func)
         except UpdateCheckerTorError:
             Alert(strings._('update_error_tor', True), QtWidgets.QMessageBox.Warning)
         except UpdateCheckerSOCKSHTTPError:

onionshare_gui/update_checker.py

@@ -17,12 +17,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
+from PyQt5 import QtCore
 import datetime, time, socks, socket, re, platform
 
 from . import strings, helpers
 from onionshare.settings import Settings
 from onionshare.onion import Onion
-from .alert import Alert
 
 class UpdateCheckerTorError(Exception):
     """
@@ -44,7 +44,7 @@ class UpdateCheckerInvalidLatestVersion(Exception):
     def __init__(self, latest_version):
         self.latest_version = latest_version
 
-def check_for_updates(force=False, bundled_tor_func=None):
+class UpdateChecker(QtCore.QObject):
     """
     Load http://elx57ue5uyfplgva.onion/latest-version.txt to see what the latest
     version of OnionShare is. If the latest version is newer than the
@@ -52,6 +52,13 @@ def check_for_updates(force=False, bundled_tor_func=None):
 
     Only check at most once per day, unless force is True.
     """
+    update_available = QtCore.pyqtSignal(str, str, str)
+    update_not_available = QtCore.pyqtSignal()
+
+    def __init__(self):
+        super(UpdateChecker, self).__init__()
+
+    def check(self, force=False, bundled_tor_func=None):
         # Load the settings
         settings = Settings()
         settings.load()
@@ -83,6 +90,7 @@ def check_for_updates(force=False, bundled_tor_func=None):
                 socks.set_default_proxy(socks.SOCKS5, socks_address, socks_port)
 
                 s = socks.socksocket()
+                s.settimeout(15) # 15 second timeout
                 s.connect(('elx57ue5uyfplgva.onion', 80))
 
                 http_request = 'GET /latest-version.txt HTTP/1.0\r\n'
@@ -114,7 +122,8 @@ def check_for_updates(force=False, bundled_tor_func=None):
             update_url = 'https://github.com/micahflee/onionshare/releases/tag/v{}'.format(latest_version)
             installed_version = helpers.get_version()
             if installed_version < latest_version:
-            Alert(strings._("update_available", True).format(update_url, installed_version, latest_version))
+                self.update_available.emit(update_url, installed_version, latest_version)
-            return True
+                return
 
-        return False
+            # No updates are available
+            self.update_not_available.emit()