Apply suggestions from code review

Co-authored-by: Cassidy James Blaede <cassidy@elementary.io>

Author: meisenzahl

data/io.elementary.appcenter.gschema.xml

@@ -41,10 +41,10 @@
       <summary>Unix UTC time of last cache refresh</summary>
       <description>Used to determine when AppCenter last refreshed its caches and checked for package updates</description>
     </key>
-    <key type="b" name="automatically-install-flatpak-updates">
+    <key type="b" name="automatic-updates">
       <default>false</default>
-      <summary>Automatically install Flatpak updates</summary>
-      <description>Whether to automatically install updates to curated Flatpaks</description>
+      <summary>Automatic updates</summary>
+      <description>Whether to automatically install updates to curated Flatpak apps</description>
     </key>
   </schema>
 </schemalist>

src/Core/Client.vala

@@ -167,7 +167,7 @@ public class AppCenterCore.Client : Object {
         });
 
         if (nm.get_network_available ()) {
-            if (last_cache_update_is_old && AppCenter.App.settings.get_boolean ("automatically-install-flatpak-updates")) {
+            if (last_cache_update_is_old && AppCenter.App.settings.get_boolean ("automatic-updates")) {
                 yield refresh_updates ();
                 debug ("Update Flatpaks");
                 var installed_apps = yield FlatpakBackend.get_default ().get_installed_applications (cancellable);

src/Core/UpdateManager.vala

@@ -102,7 +102,7 @@ public class AppCenterCore.UpdateManager : Object {
                 debug ("Added %s to app updates", flatpak_update);
                 apps_with_updates.add (appcenter_package);
 
-                if (!(AppCenter.App.settings.get_boolean ("automatically-install-flatpak-updates") && appcenter_package.is_native)) {
+                if (!(AppCenter.App.settings.get_boolean ("automatic-updates") && appcenter_package.is_native)) {
                     count++;
                 }
 
@@ -128,7 +128,7 @@ public class AppCenterCore.UpdateManager : Object {
                     continue;
                 }
 
-                if (!AppCenter.App.settings.get_boolean ("automatically-install-flatpak-updates")) {
+                if (!AppCenter.App.settings.get_boolean ("automatic-updates")) {
                     os_count++;
                 }
 

src/MainWindow.vala

@@ -214,12 +214,12 @@ public class AppCenter.MainWindow : Hdy.ApplicationWindow {
 
         spinner = new Gtk.Spinner ();
 
-        var automatically_install_flatpak_updates_button = new Granite.SwitchModelButton (_("Automatic Updates")) {
+        var automatic_updates_button = new Granite.SwitchModelButton (_("Automatic Updates")) {
             description = _("Automatically install updates to curated apps")
         };
 
-        automatically_install_flatpak_updates_button.notify["active"].connect (() => {
-            if (automatically_install_flatpak_updates_button.active) {
+        automatic_updates_button.notify["active"].connect (() => {
+            if (automatic_updates_button.active) {
                 AppCenterCore.Client.get_default ().update_cache.begin (true);
             } else {
                 AppCenterCore.Client.get_default ().cancel_updates (true);
@@ -234,7 +234,7 @@ public class AppCenter.MainWindow : Hdy.ApplicationWindow {
             row_spacing = 6
         };
 
-        menu_popover_grid.add (automatically_install_flatpak_updates_button);
+        menu_popover_grid.add (automatic_updates_button);
 
         menu_popover_grid.show_all ();
 
@@ -290,8 +290,8 @@ public class AppCenter.MainWindow : Hdy.ApplicationWindow {
         App.settings.get ("window-position", "(ii)", out window_x, out window_y);
         App.settings.get ("window-size", "(ii)", out window_width, out window_height);
         App.settings.bind (
-            "automatically-install-flatpak-updates",
-            automatically_install_flatpak_updates_button,
+            "automatic-updates",
+            automatic_updates_button,
             "active",
             SettingsBindFlags.DEFAULT
         );