Merge lp:~philip.scott/wingpanel-indicator-network/secure-icons into lp:~wingpanel-devs/wingpanel-indicator-network/trunk

[Felipe Escoto]

Use -secure icons for VPN

Fixes: https://bugs.launchpad.net/wingpanel-indicator-network/+bug/1608005

[lp:~philip.scott/wingpanel-indicator-network/secure-icons]

205. By Felipe Escoto on 2016-11-21

Use -secure icons for VPN

[Danielle Foré (danrabbit)]

I can confirm that this branch works as expected :)

review: Approve

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-11-03 21:58:12 +0000
+++ src/Indicator.vala	2016-11-21 02:42:26 +0000
@@ -46,6 +46,7 @@
         if (popover_widget == null) {
             popover_widget = new Widgets.PopoverWidget ();
             popover_widget.notify["state"].connect (on_state_changed);
+            popover_widget.notify["secure"].connect (on_state_changed);
             popover_widget.settings_shown.connect (() => { close (); });
 
             on_state_changed ();
@@ -59,7 +60,7 @@
         assert (popover_widget != null);
         assert (display_widget != null);
 
-        display_widget.update_state (popover_widget.state);
+        display_widget.update_state (popover_widget.state, popover_widget.secure);
     }
 
     private void start_monitor () {

=== modified file 'src/Widgets/DisplayWidget.vala'
--- src/Widgets/DisplayWidget.vala	2016-11-03 22:24:46 +0000
+++ src/Widgets/DisplayWidget.vala	2016-11-21 02:42:26 +0000
@@ -33,8 +33,7 @@
         pack_start (image);
     }
 
-    public void update_state (Network.State state) {
-
+    public void update_state (Network.State state, bool secure) {
         if (animation_timeout > 0) {
             Source.remove (animation_timeout);
             animation_timeout = 0;
@@ -45,22 +44,22 @@
             image.icon_name = "network-wired-acquiring-symbolic";
             break;
         case Network.State.CONNECTED_WIRED:
-            image.icon_name = "network-wired-symbolic";
+            image.icon_name = "network-wired-%ssymbolic".printf (secure? "secure-" : "");
             break;
         case Network.State.CONNECTED_WIFI:
             image.icon_name = "network-wireless-connected-symbolic";
             break;
         case Network.State.CONNECTED_WIFI_WEAK:
-            image.icon_name = "network-wireless-signal-weak-symbolic";
+            image.icon_name = "network-wireless-signal-weak-%ssymbolic".printf (secure? "secure-" : "");
             break;
         case Network.State.CONNECTED_WIFI_OK:
-            image.icon_name = "network-wireless-signal-ok-symbolic";
+            image.icon_name = "network-wireless-signal-ok-%ssymbolic".printf (secure? "secure-" : "");
             break;
         case Network.State.CONNECTED_WIFI_GOOD:
-            image.icon_name = "network-wireless-signal-good-symbolic";
+            image.icon_name = "network-wireless-signal-good-%ssymbolic".printf (secure? "secure-" : "");
             break;
         case Network.State.CONNECTED_WIFI_EXCELLENT:
-            image.icon_name = "network-wireless-signal-excellent-symbolic";
+            image.icon_name = "network-wireless-signal-excellent-%ssymbolic".printf (secure? "secure-" : "");
             break;
         case Network.State.CONNECTING_WIFI:
             animation_timeout = Timeout.add (300, () => {
@@ -80,7 +79,7 @@
                     strength = "excellent";
                     break;
                 }
-                image.icon_name = "network-wireless-signal-" + strength + "-symbolic";
+                image.icon_name = "network-wireless-signal-" + strength + (secure? "-secure" : "") + "-symbolic";
                 return true;
             });
             break;

=== modified file 'src/common/Widgets/NMVisualizer.vala'
--- src/common/Widgets/NMVisualizer.vala	2016-11-04 01:58:51 +0000
+++ src/common/Widgets/NMVisualizer.vala	2016-11-21 02:42:26 +0000
@@ -18,28 +18,33 @@
 public abstract class Network.Widgets.NMVisualizer : Gtk.Grid {
 	protected NM.Client nm_client;
 	protected NM.RemoteSettings nm_settings;
+	protected NM.VPNConnection? active_vpn_connection = null;
 
 	protected GLib.List<WidgetNMInterface>? network_interface;
 
+	public bool secure { private set; get; default = false; }
 	public Network.State state { private set; get; default = Network.State.CONNECTING_WIRED; }
 
 	construct {
 		network_interface = new GLib.List<WidgetNMInterface>();
 
 		build_ui ();
-		
+
 		/* Monitor network manager */
 		nm_client = new NM.Client ();
 		nm_settings = new NM.RemoteSettings (null);
 
+		nm_client.notify["active-connections"].connect (update_vpn_connection);
+
 		nm_client.device_added.connect (device_added_cb);
 		nm_client.device_removed.connect (device_removed_cb);
-		
+
 		var devices = nm_client.get_devices ();
 		for (var i = 0; i < devices.length; i++)
 			device_added_cb (devices.get (i));
-		
+
 		show_all();
+		update_vpn_connection ();
 	}
 
 	protected abstract void build_ui ();
@@ -50,13 +55,13 @@
 		foreach (var widget_interface in network_interface) {
 			if (widget_interface.is_device (device)) {
 				network_interface.remove (widget_interface);
-		
+
 				// Implementation call
 				remove_interface (widget_interface);
 				break;
 			}
 		}
-		
+
 		update_interfaces_names ();
 	}
 
@@ -119,7 +124,7 @@
 
 		}
 #endif
-			
+
 		update_interfaces_names ();
 		update_all ();
 		show_all ();
@@ -142,4 +147,32 @@
 		state = next_state;
 	}
 
+	void update_vpn_connection () {
+		active_vpn_connection = null;
+
+		nm_client.get_active_connections ().foreach ((ac) => {
+			if (active_vpn_connection == null && ac.get_vpn ()) {
+				active_vpn_connection = (NM.VPNConnection) ac;
+				update_vpn_state (active_vpn_connection.get_vpn_state ());
+				active_vpn_connection.vpn_state_changed.connect (() => {
+					update_vpn_state (active_vpn_connection.get_vpn_state ());
+				});
+			}
+		});
+	}
+
+	void update_vpn_state (NM.VPNConnectionState state) {
+		switch (state) {
+			case NM.VPNConnectionState.DISCONNECTED:
+			case NM.VPNConnectionState.PREPARE:
+			case NM.VPNConnectionState.IP_CONFIG_GET:
+			case NM.VPNConnectionState.CONNECT:
+			case NM.VPNConnectionState.FAILED:
+				secure = false;
+				break;
+			case NM.VPNConnectionState.ACTIVATED:
+				secure = true;
+				break;
+		}
+	}
 }