Merge lp:~tintou/wingpanel-indicator-bluetooth/async-creation into lp:~wingpanel-devs/wingpanel-indicator-bluetooth/trunk

[Corentin Noël]

Make the indicator asynchronous and showing only if an adapter is present.
Fixed some possible crash with threads

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-04-04 14:59:57 +0000
+++ src/Indicator.vala	2016-05-01 00:09:35 +0000
@@ -15,62 +15,44 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Bluetooth {
-    public static Bluetooth.Services.ObjectManager object_manager;
-    public static Bluetooth.Indicator indicator;
-}
-
 public class Bluetooth.Indicator : Wingpanel.Indicator {
     private bool is_in_session = false;
-    private bool last_state_set = false;
 
     private Bluetooth.Widgets.PopoverWidget popover_widget;
     private Bluetooth.Widgets.DisplayWidget dynamic_icon;
+    private Bluetooth.Services.ObjectManager object_manager;
     public Indicator (bool is_in_session) {
         Object (code_name: Wingpanel.Indicator.BLUETOOTH,
                 display_name: _("bluetooth"),
                 description:_("The bluetooth indicator"));
+        this.is_in_session = is_in_session;
         object_manager = new Services.ObjectManager ();
-
-        this.visible = object_manager.has_object;
-
-        if (this.visible) {
+        object_manager.bind_property ("has-object", this, "visible", GLib.BindingFlags.SYNC_CREATE);
+
+        if (object_manager.has_object) {
             object_manager.set_last_state ();
-            last_state_set = true;
         }
 
-        object_manager.adapter_added.connect (() => {
-            visible = object_manager.has_object;
-            if (!last_state_set) {
+        object_manager.notify["has-object"].connect (() => {
+            if (object_manager.has_object) {
                 object_manager.set_last_state ();
-                last_state_set = true;
             }
         });
 
-        object_manager.adapter_removed.connect (() => {
-            visible = object_manager.has_object;
-        });
-
-        this.is_in_session = is_in_session;
-
         debug ("Bluetooth Indicator started");
     }
 
     public override Gtk.Widget get_display_widget () {
         if (dynamic_icon == null) {
-            dynamic_icon = new Bluetooth.Widgets.DisplayWidget ();
+            dynamic_icon = new Bluetooth.Widgets.DisplayWidget (object_manager);
         }
 
         return dynamic_icon;
     }
 
     public override Gtk.Widget? get_widget () {
-        if (object_manager.has_object == false) {
-            return null;
-        }
-
         if (popover_widget == null) {
-            popover_widget = new Bluetooth.Widgets.PopoverWidget (is_in_session);
+            popover_widget = new Bluetooth.Widgets.PopoverWidget (object_manager, is_in_session);
             popover_widget.request_close.connect (() => {
                 close ();
             });
@@ -89,9 +71,7 @@
 
 public Wingpanel.Indicator get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
     debug ("Activating Bluetooth Indicator");
-    if (Bluetooth.indicator == null) {
-        Bluetooth.indicator = new Bluetooth.Indicator (server_type == Wingpanel.IndicatorManager.ServerType.SESSION);
-    }
+    var indicator = new Bluetooth.Indicator (server_type == Wingpanel.IndicatorManager.ServerType.SESSION);
 
-    return Bluetooth.indicator;
+    return indicator;
 }

=== modified file 'src/Services/Manager.vala'
--- src/Services/Manager.vala	2016-04-04 14:59:57 +0000
+++ src/Services/Manager.vala	2016-05-01 00:09:35 +0000
@@ -30,11 +30,7 @@
     public signal void device_added (Bluetooth.Services.Device adapter);
     public signal void device_removed (Bluetooth.Services.Device adapter);
 
-    public bool has_object {
-        get {
-            return !adapters.is_empty;
-        }
-    }
+    public bool has_object { get; private set; default = false; }
 
     private Settings settings;
     private Bluetooth.Services.DBusInterface object_interface;
@@ -42,25 +38,35 @@
     private Gee.HashMap<string, Bluetooth.Services.Device> devices;
 
     public ObjectManager () {
+        
+    }
+
+    construct {
         adapters = new Gee.HashMap<string, Bluetooth.Services.Adapter> (null, null);
         devices = new Gee.HashMap<string, Bluetooth.Services.Device> (null, null);
-        try {
-            object_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", "/", DBusProxyFlags.NONE);
-            var objects = object_interface.get_managed_objects ();
-            objects.foreach ((path, param) => {add_path (path, param);});
-            object_interface.interfaces_added.connect ((path, param) => {add_path (path, param);});
-            object_interface.interfaces_removed.connect ((path, array) => {remove_path (path);});
-            settings = new Settings ("org.pantheon.desktop.wingpanel.indicators.bluetooth");
-        } catch (Error e) {
-            critical (e.message);
-        }
+        settings = new Settings ("org.pantheon.desktop.wingpanel.indicators.bluetooth");
+        Bus.get_proxy.begin<Bluetooth.Services.DBusInterface> (BusType.SYSTEM, "org.bluez", "/", DBusProxyFlags.NONE, null, (obj, res) => {
+            try {
+                object_interface = Bus.get_proxy.end (res);
+                object_interface.get_managed_objects ().foreach (add_path);
+                object_interface.interfaces_added.connect (add_path);
+                object_interface.interfaces_removed.connect (remove_path);
+            } catch (Error e) {
+                critical (e.message);
+            }
+        });
     }
 
+    [CCode (instance_pos = -1)]
     private void add_path (ObjectPath path, HashTable<string, HashTable<string, Variant>> param) {
         if ("org.bluez.Adapter1" in param) {
             try {
                 Bluetooth.Services.Adapter adapter = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", path, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
-                adapters.set (path, adapter);
+                lock (adapters) {
+                    adapters.set (path, adapter);
+                }
+                has_object = true;
+
                 adapter_added (adapter);
                 (adapter as DBusProxy).g_properties_changed.connect ((changed, invalid) => {
                     var powered = changed.lookup_value("Powered", new VariantType("b"));
@@ -75,21 +81,32 @@
             try {
                 Bluetooth.Services.Device device = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", path, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
                 if (device.paired) {
-                    devices.set (path, device);
+                    lock (devices) {
+                        devices.set (path, device);
+                    }
+
                     device_added (device);
                 }
+
                 (device as DBusProxy).g_properties_changed.connect ((changed, invalid) => {
                     var connected = changed.lookup_value("Connected", new VariantType("b"));
                     if (connected != null) {
                         check_global_state ();
                     }
+
                     var paired = changed.lookup_value("Paired", new VariantType("b"));
                     if (paired != null) {
                         if (device.paired) {
-                            devices.set (path, device);
+                            lock (devices) {
+                                devices.set (path, device);
+                            }
+
                             device_added (device);
                         } else {
-                            devices.unset (path);
+                            lock (devices) {
+                                devices.unset (path);
+                            }
+
                             device_removed (device);
                         }
                     }
@@ -100,31 +117,44 @@
         }
     }
 
+    [CCode (instance_pos = -1)]
     public void remove_path (ObjectPath path) {
-        var adapter = adapters.get (path);
-        if (adapter != null) {
-            adapters.unset (path);
-            adapter_removed (adapter);
-            return;
+        lock (adapters) {
+            var adapter = adapters.get (path);
+            if (adapter != null) {
+                adapters.unset (path);
+                has_object = !adapters.is_empty;
+
+                adapter_removed (adapter);
+                return;
+            }
         }
 
-        var device = devices.get (path);
-        if (device != null) {
-            devices.unset (path);
-            device_removed (device);
+        lock (devices) {
+            var device = devices.get (path);
+            if (device != null) {
+                devices.unset (path);
+                device_removed (device);
+            }
         }
     }
 
     public Gee.Collection<Bluetooth.Services.Adapter> get_adapters () {
-        return adapters.values;
+        lock (adapters) {
+            return adapters.values;
+        }
     }
 
     public Gee.Collection<Bluetooth.Services.Device> get_devices () {
-        return devices.values;
+        lock (devices) {
+            return devices.values;
+        }
     }
 
     public Bluetooth.Services.Adapter? get_adapter_from_path (string path) {
-        return adapters.get (path);
+        lock (adapters) {
+            return adapters.get (path);
+        }
     }
 
     private void check_global_state () {
@@ -132,9 +162,11 @@
     }
 
     public bool get_connected () {
-        foreach (var device in devices.values) {
-            if (device.connected) {
-                return true;
+        lock (devices) {
+            foreach (var device in devices.values) {
+                if (device.connected) {
+                    return true;
+                }
             }
         }
 
@@ -142,9 +174,11 @@
     }
 
     public bool get_global_state () {
-        foreach (var adapter in adapters.values) {
-            if (adapter.powered) {
-                return true;
+        lock (adapters) {
+            foreach (var adapter in adapters.values) {
+                if (adapter.powered) {
+                    return true;
+                }
             }
         }
 
@@ -153,18 +187,22 @@
 
     public void set_global_state (bool state) {
         new Thread<void*> (null, () => {
-            foreach (var device in devices.values) {
-                if (device.connected) {
-                    try {
-                        device.disconnect ();
-                    } catch (Error e) {
-                        critical (e.message);
+            lock (devices) {
+                foreach (var device in devices.values) {
+                    if (device.connected) {
+                        try {
+                            device.disconnect ();
+                        } catch (Error e) {
+                            critical (e.message);
+                        }
                     }
                 }
             }
 
-            foreach (var adapter in adapters.values) {
-                adapter.powered = state;
+            lock (adapters) {
+                foreach (var adapter in adapters.values) {
+                    adapter.powered = state;
+                }
             }
 
             settings.set_boolean ("bluetooth-enabled", state);

=== modified file 'src/Widgets/DisplayWidget.vala'
--- src/Widgets/DisplayWidget.vala	2015-11-15 15:51:29 +0000
+++ src/Widgets/DisplayWidget.vala	2016-05-01 00:09:35 +0000
@@ -16,7 +16,7 @@
  */
 
 public class Bluetooth.Widgets.DisplayWidget : Gtk.Image {
-    public DisplayWidget () {
+    public DisplayWidget (Bluetooth.Services.ObjectManager object_manager) {
         icon_size = Gtk.IconSize.LARGE_TOOLBAR;
         set_icon (object_manager.get_global_state (), object_manager.get_connected ());
 

=== modified file 'src/Widgets/PopoverWidget.vala'
--- src/Widgets/PopoverWidget.vala	2016-02-15 02:04:56 +0000
+++ src/Widgets/PopoverWidget.vala	2016-05-01 00:09:35 +0000
@@ -20,10 +20,10 @@
     private Bluetooth.Widgets.MainView main_view;
     private Bluetooth.Widgets.DiscoveryView discovery_view;
 
-    public PopoverWidget (bool is_in_session) {
+    public PopoverWidget (Bluetooth.Services.ObjectManager object_manager, bool is_in_session) {
         transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
-        main_view = new Bluetooth.Widgets.MainView (is_in_session);
-        discovery_view = new Bluetooth.Widgets.DiscoveryView ();
+        main_view = new Bluetooth.Widgets.MainView (object_manager, is_in_session);
+        discovery_view = new Bluetooth.Widgets.DiscoveryView (object_manager);
 
         add (main_view);
         add (discovery_view);

=== modified file 'src/Widgets/Views/DiscoveryView.vala'
--- src/Widgets/Views/DiscoveryView.vala	2016-02-15 02:04:56 +0000
+++ src/Widgets/Views/DiscoveryView.vala	2016-05-01 00:09:35 +0000
@@ -19,8 +19,9 @@
     public Gtk.Button back_button;
     private Gtk.Grid device_grid;
 
-    public DiscoveryView () {
-        
+    unowned Bluetooth.Services.ObjectManager object_manager;
+    public DiscoveryView (Bluetooth.Services.ObjectManager object_manager) {
+        this.object_manager = object_manager;
     }
 
     construct {

=== modified file 'src/Widgets/Views/MainView.vala'
--- src/Widgets/Views/MainView.vala	2016-02-12 04:24:08 +0000
+++ src/Widgets/Views/MainView.vala	2016-05-01 00:09:35 +0000
@@ -27,7 +27,7 @@
     private Wingpanel.Widgets.Switch main_switch;
     private Gtk.Box devices_box;
 
-    public MainView (bool is_in_session) {
+    public MainView (Bluetooth.Services.ObjectManager object_manager, bool is_in_session) {
         main_switch = new Wingpanel.Widgets.Switch (_("Bluetooth"), object_manager.get_global_state ());
         show_settings_button = new Wingpanel.Widgets.Button (_("Bluetooth Settings…"));
         discovery_button = new Wingpanel.Widgets.Button (_("Discover Devices…"));