Merge lp:~davidmhewitt/switchboard-plug-security-privacy/fix-1446770-location-settings into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[David Hewitt]

Add Location panel to configure geoclue2 agent

Adds an extra panel to the plug to configure the Pantheon location agent (https://launchpad.net/pantheon-agent-geoclue2). The panel is written in such a way that it only registers itself if the agent is installed. If the user does not have the location agent installed, no change is made to the plug.

[Danielle Foré (danrabbit)]

I wonder if "Location Services" makes more sense. Especially in context, I feel like "Location Services Are Disabled" makes more sense than "Location Is Disabled". Any thoughts on that?

Right now the way you're doing the disabled_panel doesn't actually hide the stuff below it, so you can see the borders get a little wonky because things are stacked on top of each other

[lp:~davidmhewitt/switchboard-plug-security-privacy/fix-1446770-location-settings]

304. By David Hewitt on 2017-02-28

Rename to 'Location Services' and switch to Gtk.Stack to show/hide disabled AlertView

305. By David Hewitt on 2017-02-28

Fix stack

306. By David Hewitt on 2017-02-28

Update copy

307. By David Hewitt on 2017-02-28

Remove double spacing between lines in AlertView

308. By David Hewitt on 2017-02-28

Merged trunk

[Danielle Foré (danrabbit)]

just a small inline comment. Can we make the title label in the alert view title case?

[lp:~davidmhewitt/switchboard-plug-security-privacy/fix-1446770-location-settings]

309. By David Hewitt on 2017-02-28

* Ensure location bits don't get set up if agent not installed
* Use title case in AlertView
* Merged trunk

[Danielle Foré (danrabbit)]

Looks good! Thanks for all of your work on this :)

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-27 22:58:22 +0000
+++ src/CMakeLists.txt	2017-02-28 22:10:47 +0000
@@ -21,6 +21,7 @@
     Views/FirewallPanel.vala
     Views/LockPanel.vala
     Views/TrackPanel.vala
+    Views/LocationPanel.vala
 
     Widgets/AppChooser.vala
     Widgets/AppRow.vala

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2017-02-28 21:01:45 +0000
+++ src/Plug.vala	2017-02-28 22:10:47 +0000
@@ -25,14 +25,18 @@
     public static Plug plug;
     public static Gtk.LockButton lock_button;
     public static Blacklist blacklist;
+    public static LocationPanel location;
     public static FirewallPanel firewall;
 
     public class Plug : Switchboard.Plug {
         Gtk.Grid main_grid;
         Gtk.Stack stack;
+
         TrackPanel tracking;
         ServiceList service_list;
 
+        bool location_agent_installed = false;
+
         public Plug () {
             Object (category: Category.PERSONAL,
                     code_name: Build.PLUGCODENAME,
@@ -40,10 +44,16 @@
                     description: _("Configure firewall, screen lock, and activity information"),
                     icon: "preferences-system-privacy",
                     supported_settings: new Gee.TreeMap<string, string?> (null, null));
+
+            location_agent_installed = SecurityPrivacy.LocationPanel.location_agent_installed ();
             supported_settings.set ("security", null);
             supported_settings.set ("security/privacy", "tracking");
             supported_settings.set ("security/firewall", "firewall");
             supported_settings.set ("security/screensaver", "locking");
+            
+            if (location_agent_installed) {
+                supported_settings.set ("security/privacy/location", "location");
+            }
             plug = this;
         }
 
@@ -117,6 +127,11 @@
             stack.add_titled (locking, "locking", _("Locking"));
             stack.add_titled (firewall, "firewall", _("Firewall"));
 
+            if (location_agent_installed) {
+                location = new LocationPanel ();
+                stack.add_titled (location, "location", _("Location Services"));
+            }                
+
             service_list = new ServiceList ();
 
             var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
@@ -159,6 +174,10 @@
                     stack.set_visible_child_name ("firewall");
                     service_list.select_service_name ("firewall");
                     break;
+                case "location":
+                    stack.set_visible_child_name ("location");
+                    service_list.select_service_name ("location");
+                    break;
             }
         }
 
@@ -169,6 +188,9 @@
             map.set ("%s → %s".printf (display_name, _("Locking")), "locking");
             map.set ("%s → %s → %s".printf (display_name, _("Locking"), _("Privacy Mode")), "locking<sep>privacy-mode");
             map.set ("%s → %s".printf (display_name, _("Firewall")), "firewall");
+            if (location_agent_installed) {
+                map.set ("%s → %s".printf (display_name, _("Location Services")), "location");
+            }
             return map;
         }
     }

=== added file 'src/Views/LocationPanel.vala'
--- src/Views/LocationPanel.vala	1970-01-01 00:00:00 +0000
+++ src/Views/LocationPanel.vala	2017-02-28 22:10:47 +0000
@@ -0,0 +1,206 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2017 elementary LLC.
+ * Copyright (C) 2017 David Hewitt <[e-mail]>   
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Authored by: David Hewitt <[e-mail]>
+ */
+
+public class SecurityPrivacy.LocationPanel : Gtk.Grid {
+
+    private GLib.Settings location_settings;
+    private Variant remembered_apps;
+    private VariantDict remembered_apps_dict;
+    private Gtk.ListStore list_store;
+    private Gtk.TreeView tree_view;
+    private Gtk.Grid treeview_grid;
+    private Gtk.Stack disabled_stack;
+    public Gtk.Switch status_switch;
+
+    private enum Columns {
+        AUTHORIZED,
+        NAME,
+        ICON,
+        APP_ID,
+        N_COLUMNS
+    }
+
+    construct {
+        column_spacing = 12;
+        row_spacing = 6;
+        margin = 12;
+
+        location_settings = new GLib.Settings ("org.pantheon.agent-geoclue2");
+        disabled_stack = new Gtk.Stack ();
+        
+        var status_icon = new Gtk.Image.from_icon_name ("find-location", Gtk.IconSize.DIALOG);
+
+        var status_label = new Gtk.Label (_("Location Services"));
+        status_label.get_style_context ().add_class ("h2");
+        status_label.hexpand = true;
+        status_label.xalign = 0;
+
+        status_switch = new Gtk.Switch ();
+        status_switch.valign = Gtk.Align.CENTER;        
+
+        attach (status_icon, 0, 0, 1, 1);
+        attach (status_label, 1, 0, 1, 1);
+        attach (status_switch, 2, 0, 1, 1);
+        attach (disabled_stack, 0, 1, 3, 1);        
+        
+        create_treeview ();
+        create_disabled_panel ();
+
+        location_settings.bind ("location-enabled", status_switch, "active", SettingsBindFlags.DEFAULT);
+        status_switch.notify["active"].connect (() => {
+            update_stack_visible_child ();
+        });
+        location_settings.changed.connect((key) => {
+            populate_app_treeview ();
+        });
+
+        update_stack_visible_child ();    
+    }
+    
+    private void update_stack_visible_child () {
+        if (status_switch.active) {
+            disabled_stack.set_visible_child_name ("enabled");
+        } else {
+            disabled_stack.set_visible_child_name ("disabled");
+        }    
+    }
+
+    private void create_disabled_panel () {
+        var disabled_frame = new Gtk.Frame (null);
+        disabled_frame.expand = true;
+
+        var title = _("Location Services Are Disabled");
+        var description = ("%s\n%s\n%s".printf (
+                    _("While location services are disabled, location requests from apps will be automatically rejected."),
+                    _("The additional functionality that location access provides in those apps will be affected."),
+                    _("This will not prevent apps from trying to determine your location based on IP address.")));
+
+        var alert = new Granite.Widgets.AlertView (title, description, "");
+        alert.show_all ();
+
+        disabled_frame.add (alert);
+        disabled_stack.add_named (disabled_frame, "disabled");
+        disabled_frame.set_visible (true);
+    }
+
+    private void create_treeview () {
+        var locations_label = new Gtk.Label (_("Allow the apps below to determine your location"));
+        locations_label.xalign = 0;
+
+        list_store = new Gtk.ListStore (Columns.N_COLUMNS, typeof (bool),
+                                        typeof (string), typeof (string), typeof (string));
+
+        tree_view = new Gtk.TreeView.with_model (list_store);
+        tree_view.vexpand = true;
+        tree_view.headers_visible = false;
+        tree_view.activate_on_single_click = true;
+
+        var celltoggle = new Gtk.CellRendererToggle ();
+        tree_view.row_activated.connect ((path, column) => {
+            Value active;
+            Gtk.TreeIter iter;
+            list_store.get_iter (out iter, path);
+            list_store.get_value (iter, Columns.AUTHORIZED, out active);
+            var is_active = !active.get_boolean ();
+            list_store.set (iter, Columns.AUTHORIZED, is_active);
+            Value app_id;
+            list_store.get_value (iter, Columns.APP_ID, out app_id);
+
+            uint32 level = get_app_level (app_id.get_string ());
+            save_app_settings (app_id.get_string (), is_active, level);
+        });
+
+        var cell = new Gtk.CellRendererText ();
+        var cellpixbuf = new Gtk.CellRendererPixbuf ();
+        cellpixbuf.stock_size = Gtk.IconSize.DND;
+        tree_view.insert_column_with_attributes (-1, "", celltoggle, "active", Columns.AUTHORIZED);
+        tree_view.insert_column_with_attributes (-1, "", cellpixbuf, "icon-name", Columns.ICON);
+        tree_view.insert_column_with_attributes (-1, "", cell, "markup", Columns.NAME);
+
+        populate_app_treeview ();
+
+        var scrolled = new Gtk.ScrolledWindow (null, null);
+        scrolled.shadow_type = Gtk.ShadowType.IN;
+        scrolled.expand = true;
+        scrolled.add (tree_view);
+
+        treeview_grid = new Gtk.Grid ();
+        treeview_grid.margin_top = 12;
+        treeview_grid.row_spacing = 6;
+        treeview_grid.attach (locations_label, 0, 0, 1, 1);
+        treeview_grid.attach (scrolled, 0, 1, 1, 1);
+        
+        disabled_stack.add_named (treeview_grid, "enabled");
+        treeview_grid.set_visible (true);
+    }
+
+    private void populate_app_treeview () {
+        load_remembered_apps ();
+        Gtk.TreePath? current_selection;
+        Gtk.TreeViewColumn? current_column;
+        tree_view.get_cursor (out current_selection, out current_column);
+
+        list_store.clear ();
+        foreach (var app in remembered_apps) {
+            string app_id = app.get_child_value (0).get_string ();
+            bool authed = app.get_child_value (1).get_variant ().get_child_value (0).get_boolean ();
+            var app_info = new DesktopAppInfo (app_id + ".desktop");
+            add_liststore_item (list_store, authed, app_info.get_display_name (), app_info.get_icon ().to_string (), app_id);
+        }
+
+        tree_view.set_cursor (current_selection, current_column, false);
+    }
+
+    private void add_liststore_item (Gtk.ListStore list_store, bool active, string name, string icon, string app_id) {
+        Gtk.TreeIter iter;
+        list_store.append (out iter);
+        list_store.set (iter, Columns.AUTHORIZED, active, Columns.NAME, name,
+                        Columns.ICON, icon, Columns.APP_ID, app_id);
+    }
+
+	private void load_remembered_apps () {
+	    remembered_apps = location_settings.get_value ("remembered-apps");
+        remembered_apps_dict = new VariantDict (location_settings.get_value ("remembered-apps"));
+	}
+
+	private void save_app_settings (string desktop_id, bool authorized, uint32 accuracy_level) {
+		Variant[2] tuple_vals = new Variant[2];
+		tuple_vals[0] = new Variant.boolean (authorized);
+		tuple_vals[1] = new Variant.uint32 (accuracy_level);
+		remembered_apps_dict.insert_value (desktop_id, new Variant.tuple (tuple_vals));
+		location_settings.set_value ("remembered-apps", remembered_apps_dict.end ());
+        load_remembered_apps ();
+	}
+
+    private uint32 get_app_level (string desktop_id) {
+        return remembered_apps.lookup_value (desktop_id, GLib.VariantType.TUPLE).get_child_value (1).get_uint32 ();
+    }
+
+    public static bool location_agent_installed () {
+        var schemas = GLib.SettingsSchemaSource.get_default ();
+        if (schemas.lookup ("org.pantheon.agent-geoclue2", true) != null) {
+            return true;
+        }
+
+        return false;
+    }
+}

=== modified file 'src/Widgets/ServiceList.vala'
--- src/Widgets/ServiceList.vala	2017-02-28 21:01:45 +0000
+++ src/Widgets/ServiceList.vala	2017-02-28 22:10:47 +0000
@@ -6,6 +6,8 @@
                 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"));
@@ -22,6 +24,23 @@
                 firewall_item.status = ServiceItem.Status.DISABLED;
             }
         });
+
+        if (SecurityPrivacy.LocationPanel.location_agent_installed ()) {
+            location_item = new ServiceItem ("find-location", "location", _("Location Services"));
+            add_service (location_item);
+            update_location_status ();
+            SecurityPrivacy.location.status_switch.notify["active"].connect (() => {
+                update_location_status ();
+            });
+        }      
+    }
+
+    private void update_location_status () {
+        if (SecurityPrivacy.location.status_switch.active) {
+            location_item.status = ServiceItem.Status.ENABLED;
+        } else {
+            location_item.status = ServiceItem.Status.DISABLED;
+        }    
     }
 
     public void add_service (ServiceItem service) {