Merge lp:~xapantu/switchboard-plug-networking/rfkill into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[xapantu]

Allow a per device deactivation on the rfkill side.

Allow a per device deactivation on the rfkill side. Does not work very well: NetworkManager disables every wifi connection or none apparently, but it will probably be fixed soon.

[Cody Garver (codygarver)]

Conflicts with trunk

[xapantu (xapantu)]

Updated

[lp:~xapantu/switchboard-plug-networking/rfkill]

148. By xapantu on 2015-08-16

rfkill devices: don't disable every one of them

=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2015-08-14 11:30:28 +0000
+++ src/Widgets/WifiInterface.vala	2015-08-16 10:50:45 +0000
@@ -163,15 +163,12 @@
         }
 
         protected override void update_switch () {
-            control_switch.active = !software_locked;
+            control_switch.active = !software_locked && nm_client.wireless_get_enabled ();
         }
 
         protected override void control_switch_activated () {
             var active = control_switch.active;
-            if (active != !software_locked) {
-                rfkill.set_software_lock (RFKillDeviceType.WLAN, !active);
-                client.wireless_set_enabled (active);
-            }
+            change_state (active);
         }
 
         protected override void wifi_activate_cb (WifiMenuItem row) {

=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2015-08-11 22:35:35 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2015-08-16 10:50:45 +0000
@@ -163,6 +163,17 @@
 
 	}
 
+	protected void change_state (bool enable) {
+		if (enable != !software_locked) {
+			RFKillDevice? rfkill_device = rfkill.get_device_for_nm_device (wifi_device);
+			rfkill_device.software_lock = !enable;
+			software_locked = !enable;
+		}
+		if (enable) {
+			nm_client.wireless_set_enabled (enable);
+		}
+	}
+
 	void update_active_ap () {
 		debug("Update active AP");
 		
@@ -282,19 +293,13 @@
 			break;
 		}
 
-		debug("New network state: %s", state.to_string ());
-		
 		/* Wifi */
 		software_locked = false;
 		hardware_locked = false;
-		foreach (var device in rfkill.get_devices ()) {
-			if (device.device_type != RFKillDeviceType.WLAN)
-				continue;
-
-			if (device.software_lock)
-				software_locked = true;
-			if (device.hardware_lock)
-				hardware_locked = true;
+		RFKillDevice? rfkill_device = rfkill.get_device_for_nm_device (wifi_device);
+		if (rfkill_device != null) {
+			software_locked = rfkill_device.software_lock;
+			hardware_locked = rfkill_device.hardware_lock;
 		}
 		locked = hardware_locked || software_locked;
 

=== modified file 'src/common/rfkill.vala'
--- src/common/rfkill.vala	2015-08-01 20:32:38 +0000
+++ src/common/rfkill.vala	2015-08-16 10:50:45 +0000
@@ -46,6 +46,7 @@
     internal RFKillDeviceType _device_type;
     internal bool _software_lock;
     internal bool _hardware_lock;
+    internal string mac_address;
 
     internal RFKillDevice (RFKillManager manager, uint32 idx, RFKillDeviceType device_type, bool software_lock, bool hardware_lock)
     {
@@ -54,6 +55,15 @@
         _device_type = device_type;
         _software_lock = software_lock;
         _hardware_lock = hardware_lock;
+
+        /* MAC Address */
+        try {
+            if (!FileUtils.get_contents ("/sys/class/rfkill/rfkill%d/device/macaddress".printf((int)idx), out mac_address)) {
+                mac_address = "";
+            }
+        } catch (Error e) {
+            mac_address = "";
+        }
     }
 }
 
@@ -83,10 +93,16 @@
 
     public List<RFKillDevice> get_devices ()
     {
-        var devices = new List<RFKillDevice> ();
-        foreach (var device in _devices)
-            devices.append (device);
-        return devices;
+        return _devices.copy ();
+    }
+
+    public RFKillDevice? get_device_for_nm_device (NM.Device nm_device) {
+        foreach (var device in _devices) {
+            if (nm_device.get_hw_address ().up () == device.mac_address.strip ().up ()) {
+                return device;
+            }
+        }
+        return null;
     }
 
     public void set_software_lock (RFKillDeviceType type, bool lock_enabled)