Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/history-sidebar-status into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Danielle Foré]

ServiceList.vala:
* Change update_location_status to generic update_service_status
* Use above method for firewall and history status

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2017-02-28 22:10:20 +0000
+++ src/Plug.vala	2017-03-01 22:45:00 +0000
@@ -27,12 +27,12 @@
     public static Blacklist blacklist;
     public static LocationPanel location;
     public static FirewallPanel firewall;
+    public static TrackPanel tracking;
 
     public class Plug : Switchboard.Plug {
         Gtk.Grid main_grid;
         Gtk.Stack stack;
 
-        TrackPanel tracking;
         ServiceList service_list;
 
         bool location_agent_installed = false;

=== modified file 'src/Views/TrackPanel.vala'
--- src/Views/TrackPanel.vala	2017-02-28 17:09:23 +0000
+++ src/Views/TrackPanel.vala	2017-03-01 22:45:00 +0000
@@ -22,7 +22,7 @@
 
 public class SecurityPrivacy.TrackPanel : Gtk.Grid {
     private Widgets.ClearUsagePopover remove_popover;
-    private Gtk.Switch record_switch;
+    public Gtk.Switch record_switch;
 
     public TrackPanel () {
         Object (column_spacing: 12,

=== modified file 'src/Widgets/ServiceList.vala'
--- src/Widgets/ServiceList.vala	2017-02-28 22:10:20 +0000
+++ src/Widgets/ServiceList.vala	2017-03-01 22:45:00 +0000
@@ -6,8 +6,6 @@
                 selection_mode: Gtk.SelectionMode.SINGLE);
     }
 
-    ServiceItem? location_item;
-
     construct {
         var privacy_item = new ServiceItem ("document-open-recent", "tracking", _("History"));
         var lock_item = new ServiceItem ("system-lock-screen", "locking", _("Locking"));
@@ -18,28 +16,31 @@
         add_service (firewall_item);
 
         SecurityPrivacy.firewall.status_switch.notify["active"].connect (() => {
-            if (SecurityPrivacy.firewall.status_switch.active) {
-                firewall_item.status = ServiceItem.Status.ENABLED;
-            } else {
-                firewall_item.status = ServiceItem.Status.DISABLED;
-            }
+            update_service_status (firewall_item, SecurityPrivacy.firewall.status_switch.active);
+        });
+
+        update_service_status (privacy_item, SecurityPrivacy.tracking.record_switch.active);
+
+        SecurityPrivacy.tracking.record_switch.notify["active"].connect (() => {
+            update_service_status (privacy_item, SecurityPrivacy.tracking.record_switch.active);
         });
 
         if (SecurityPrivacy.LocationPanel.location_agent_installed ()) {
-            location_item = new ServiceItem ("find-location", "location", _("Location Services"));
+            var location_item = new ServiceItem ("find-location", "location", _("Location Services"));
             add_service (location_item);
-            update_location_status ();
+            update_service_status (location_item, SecurityPrivacy.location.status_switch.active);
+
             SecurityPrivacy.location.status_switch.notify["active"].connect (() => {
-                update_location_status ();
+                update_service_status (location_item, SecurityPrivacy.location.status_switch.active);
             });
         }      
     }
 
-    private void update_location_status () {
-        if (SecurityPrivacy.location.status_switch.active) {
-            location_item.status = ServiceItem.Status.ENABLED;
+    private void update_service_status (ServiceItem service_item, bool service_status) {
+        if (service_status) {
+            service_item.status = ServiceItem.Status.ENABLED;
         } else {
-            location_item.status = ServiceItem.Status.DISABLED;
+            service_item.status = ServiceItem.Status.DISABLED;
         }    
     }