From cf78c6c0c59aec59063ee19daaa2d57c2685e79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 8 Oct 2024 10:51:38 -0700 Subject: [PATCH 1/3] SystemUpdate: make sure we notify if network is metered --- src/Backends/SystemUpdate.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backends/SystemUpdate.vala b/src/Backends/SystemUpdate.vala index d2ef61d..17f218b 100644 --- a/src/Backends/SystemUpdate.vala +++ b/src/Backends/SystemUpdate.vala @@ -124,7 +124,7 @@ public class SettingsDaemon.Backends.SystemUpdate : Object { return; } - if (notify) { + if (notify || NetworkMonitor.get_default ().network_metered) { var notification = new Notification (_("Update available")); notification.set_default_action (Application.ACTION_PREFIX + Application.SHOW_UPDATES_ACTION); From 7ee0db4dbc0bc806d83d7b378a4296d837f29eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 8 Oct 2024 10:53:21 -0700 Subject: [PATCH 2/3] Update SystemUpdate.vala --- src/Backends/SystemUpdate.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backends/SystemUpdate.vala b/src/Backends/SystemUpdate.vala index 17f218b..0ce77e3 100644 --- a/src/Backends/SystemUpdate.vala +++ b/src/Backends/SystemUpdate.vala @@ -124,7 +124,7 @@ public class SettingsDaemon.Backends.SystemUpdate : Object { return; } - if (notify || NetworkMonitor.get_default ().network_metered) { + if (notify || (NetworkMonitor.get_default ().network_metered && settings.get_boolean ("automatic-updates"))) { var notification = new Notification (_("Update available")); notification.set_default_action (Application.ACTION_PREFIX + Application.SHOW_UPDATES_ACTION); From 6d51d9679db355cf84933070a79b99bbf74769a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 8 Oct 2024 10:54:51 -0700 Subject: [PATCH 3/3] Update SystemUpdate.vala --- src/Backends/SystemUpdate.vala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Backends/SystemUpdate.vala b/src/Backends/SystemUpdate.vala index 0ce77e3..e890263 100644 --- a/src/Backends/SystemUpdate.vala +++ b/src/Backends/SystemUpdate.vala @@ -119,12 +119,15 @@ public class SettingsDaemon.Backends.SystemUpdate : Object { update_state (AVAILABLE); - if (!force && !NetworkMonitor.get_default ().network_metered && settings.get_boolean ("automatic-updates")) { + var metered_network = NetworkMonitor.get_default ().network_metered; + var auto_updates = settings.get_boolean ("automatic-updates"); + + if (!force && !metered_network && auto_updates) { update.begin (); return; } - if (notify || (NetworkMonitor.get_default ().network_metered && settings.get_boolean ("automatic-updates"))) { + if (notify || (metered_network && auto_updates)) { var notification = new Notification (_("Update available")); notification.set_default_action (Application.ACTION_PREFIX + Application.SHOW_UPDATES_ACTION);