AirplaneMode: use RFKill

Set state based on rfkill device change

Change to airplane mode

less namespace

Try all rather than any

All hardware OR all software

Author: danirabbit

src/Indicator.vala

@@ -22,6 +22,7 @@ public class Network.Indicator : Wingpanel.Indicator {
 
     NetworkMonitor network_monitor;
 
+    private RFKillManager rfkill;
     private Gtk.GestureMultiPress gesture_click;
     private SimpleAction airplane_action;
 
@@ -65,19 +66,16 @@ public class Network.Indicator : Wingpanel.Indicator {
             });
         }
 
-        airplane_action = new SimpleAction.stateful ("airplane-mode", null, new Variant.boolean (popover_widget.nm_client.networking_get_enabled ()));
+        rfkill = new RFKillManager ();
+        rfkill.open ();
+
+        airplane_action = new SimpleAction.stateful ("airplane-mode", null, new Variant.boolean (rfkill.get_airplane_mode ()));
         airplane_action.activate.connect (() => {
-            popover_widget.nm_client.dbus_call.begin (
-                NM.DBUS_PATH, NM.DBUS_INTERFACE,
-                "Enable", new Variant.tuple ({new Variant.boolean (!popover_widget.nm_client.networking_get_enabled ())}),
-                null, -1, null, (obj, res) => {
-                    try {
-                        ((NM.Client) obj).dbus_set_property.end (res);
-                    } catch (Error e) {
-                        warning ("Error setting airplane mode: %s", e.message);
-                    }
-                }
-            );
+            rfkill.set_software_lock (ALL, !rfkill.get_airplane_mode ());
+        });
+
+        rfkill.device_changed.connect (() => {
+            airplane_action.set_state (new Variant.boolean (rfkill.get_airplane_mode ()));
         });
 
         var action_group = (SimpleActionGroup) popover_widget.get_action_group ("network");
@@ -102,8 +100,6 @@ public class Network.Indicator : Wingpanel.Indicator {
 
         display_widget.update_state (popover_widget.state, popover_widget.secure, popover_widget.extra_info);
 
-        airplane_action.set_state (new Variant.boolean (!popover_widget.nm_client.networking_get_enabled ()));
-
         update_tooltip ();
     }
 

src/Widgets/PopoverWidget.vala

@@ -65,7 +65,6 @@ public class Network.Widgets.PopoverWidget : Gtk.Box {
 
             var action_group = new SimpleActionGroup ();
             action_group.action_state_changed.connect ((action_name, state) => {
-                critical ("got a state change");
                 if (action_name == "airplane-mode") {
                     if (state.get_boolean ()) {
                         airplane_toggle.icon_name = "airplane-mode-symbolic";

src/rfkill.vala

@@ -80,6 +80,29 @@ public class RFKillManager : Object {
         return devices;
     }
 
+    /*
+    * Checks for Airplane mode
+    * Setting airplane mode from here does all software lock, whereas setting
+    * from a key press does all hardware lock. We need one of these two things—
+    * all devices to be locked somehow—to consider it Airplane Mode
+    */
+    public bool get_airplane_mode () {
+        var all_hardware_locked = true;
+        var all_software_locked = true;
+
+        foreach (unowned var device in get_devices ()) {
+            if (!device.software_lock) {
+                all_software_locked = false;
+            }
+
+            if (!device.hardware_lock) {
+                all_hardware_locked = false;
+            }
+        }
+
+        return all_hardware_locked || all_software_locked;
+    }
+
     public void set_software_lock (RFKillDeviceType type, bool lock_enabled) {
         var event = RFKillEvent ();
         event.type = type;