Merge lp:~fault/wingpanel-indicator-network/fix-1628541 into lp:~wingpanel-devs/wingpanel-indicator-network/trunk

[Casper Christiansen]

Prioritize networks by state

Fixes https://bugs.launchpad.net/wingpanel-indicator-network/+bug/1628541 by prioritizing network states according to their position in an array.

I gave the connecting states higher priority than connected states, due to that probably being something the user wants to know about. This can easily be changed if need be.

[Corentin Noël (tintou)]

Maybe you can get the priority by creating a `int get_priority ()` in the Network.State enum so you don't have to reiterate every time but only do a `score = inter.state.get_priority ();`

[Casper Christiansen (fault)]

> Maybe you can get the priority by creating a `int get_priority ()` in the
> Network.State enum so you don't have to reiterate every time but only do a
> `score = inter.state.get_priority ();`

You're right, that would be better performance wise. I just realized I even forgot to break the loop early once the score was found. Woops.

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:wingpanel-indicator-network failed due to conflicts:

text conflict in src/common/Utils.vala

=== modified file 'src/common/Utils.vala'
--- src/common/Utils.vala	2017-01-01 10:58:24 +0000
+++ src/common/Utils.vala	2017-01-06 14:22:44 +0000
@@ -29,7 +29,33 @@
     CONNECTING_WIFI,
     CONNECTING_WIRED,
     FAILED_WIRED,
-    FAILED_WIFI
+    FAILED_WIFI;
+
+    public int get_priority()
+    {
+        switch(this) {
+            case Network.State.CONNECTING_WIRED:
+                return 0;
+            case Network.State.CONNECTING_WIFI:
+                return 1;
+            case Network.State.CONNECTED_WIRED:
+                return 2;
+            case Network.State.CONNECTED_WIFI:
+            case Network.State.CONNECTED_WIFI_WEAK:
+            case Network.State.CONNECTED_WIFI_OK:
+            case Network.State.CONNECTED_WIFI_GOOD:
+            case Network.State.CONNECTED_WIFI_EXCELLENT:
+                return 3;
+            case Network.State.FAILED_WIRED:
+            case Network.State.FAILED_WIFI:
+                return 4;
+            case Network.State.DISCONNECTED_WIRED:
+            case Network.State.DISCONNECTED_AIRPLANE_MODE:
+                return 5;
+            default:
+                return 6;
+        }
+    }
 }
 
 namespace Network.Common.Utils {
 
=== modified file 'src/common/Widgets/NMVisualizer.vala'
--- src/common/Widgets/NMVisualizer.vala	2017-01-02 00:07:05 +0000
+++ src/common/Widgets/NMVisualizer.vala	2017-01-06 14:22:44 +0000
@@ -38,7 +38,7 @@
 
 		nm_client.device_added.connect (device_added_cb);
 		nm_client.device_removed.connect (device_removed_cb);
-		
+
 		nm_client.notify["networking-enabled"].connect (update_state);
 
 		var devices = nm_client.get_devices ();
@@ -144,9 +144,14 @@
 			state = Network.State.DISCONNECTED_AIRPLANE_MODE;
 		} else {
 			var next_state = Network.State.DISCONNECTED;
+			var best_score = int.MAX;
+
 			foreach (var inter in network_interface) {
-				if (inter.state != Network.State.DISCONNECTED) {
+				var score = inter.state.get_priority();
+
+				if (score < best_score) {
 					next_state = inter.state;
+					best_score = score;
 				}
 			}