diff --git a/dangerzone/gui/__init__.py b/dangerzone/gui/__init__.py index 6d7d164..f0249ac 100644 --- a/dangerzone/gui/__init__.py +++ b/dangerzone/gui/__init__.py @@ -123,7 +123,6 @@ def gui_main( # Check for updates log.debug("Setting up Dangezone updater") updater = UpdaterThread(dangerzone) - updater.update_check_toggled.connect(window.refresh_updates_checkbox) window.register_update_handler(updater.finished) log.debug("Consulting updater settings before checking for updates") diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index daa3c0b..6180933 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -229,11 +229,6 @@ class MainWindow(QtWidgets.QMainWindow): self.dangerzone.settings.set("updater_check", check) self.dangerzone.settings.save() - def refresh_updates_checkbox(self) -> None: - """Refreshes the "check for updates" checkbox according to the settings""" - check = self.dangerzone.settings.get("updater_check") - self.toggle_updates_action.setChecked(check) - def handle_updates(self, report: UpdateReport) -> None: """Handle update reports from the update checker thread. diff --git a/dangerzone/gui/updater.py b/dangerzone/gui/updater.py index 18dd9be..037f2aa 100644 --- a/dangerzone/gui/updater.py +++ b/dangerzone/gui/updater.py @@ -108,7 +108,6 @@ class UpdaterThread(QtCore.QThread): """ finished = QtCore.Signal(UpdateReport) - update_check_toggled = QtCore.Signal() GH_RELEASE_URL = ( "https://api.github.com/repos/freedomofpress/dangerzone/releases/latest" @@ -178,7 +177,6 @@ class UpdaterThread(QtCore.QThread): if self.check is None: log.debug("User has not been asked yet for update checks") self.check = self.prompt_for_checks() - self.update_check_toggled.emit() return bool(self.check) elif not self.check: log.debug("User has expressed that they don't want to check for updates") diff --git a/tests/gui/test_updater.py b/tests/gui/test_updater.py index e36188d..7231563 100644 --- a/tests/gui/test_updater.py +++ b/tests/gui/test_updater.py @@ -141,10 +141,7 @@ def test_linux_no_check(updater: UpdaterThread, monkeypatch: MonkeyPatch) -> Non def test_user_prompts( - qtbot: QtBot, - updater: UpdaterThread, - monkeypatch: MonkeyPatch, - mocker: MockerFixture, + updater: UpdaterThread, monkeypatch: MonkeyPatch, mocker: MockerFixture ) -> None: """Test prompting users to ask them if they want to enable update checks.""" # First run @@ -168,10 +165,8 @@ def test_user_prompts( # Check disabling update checks. prompt_mock().launch.return_value = False # type: ignore [attr-defined] expected_settings["updater_check"] = False - - with qtbot.waitSignal(updater.update_check_toggled) as blocker: - assert updater.should_check_for_updates() == False - assert updater.dangerzone.settings.get_updater_settings() == expected_settings + assert updater.should_check_for_updates() == False + assert updater.dangerzone.settings.get_updater_settings() == expected_settings # Reset the "updater_check" field and check enabling update checks. updater.dangerzone.settings.set("updater_check", None)