Merge lp:~donadigo/switchboard-plug-networking/use-existing-connection into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Don't create new connection when it already exists.

The branch fixes very important bug, that makes NetworkManager exceed the limit of connections. Currently the plug blindly creates new connection (without checking if it already exists) and when you use the plug very often it ends up reaching the limit of available connections in the NetworkManager and causing problems with the plug itself.

[lp:~donadigo/switchboard-plug-networking/use-existing-connection]

135. By Adam Bieńkowski on 2015-08-06

Always get a valid connection

136. By Adam Bieńkowski on 2015-08-06

Simplify get_valid_connection

137. By Adam Bieńkowski on 2015-08-06

Don't check if list is empty

[xapantu (xapantu)]

Looks good to me.

review: Approve

=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2015-08-04 19:30:02 +0000
+++ src/Widgets/WifiInterface.vala	2015-08-06 20:43:54 +0000
@@ -105,8 +105,18 @@
             if (device != null) {  
                 /* Do not activate connection if it is already activated */
                 if (wifi_device.get_active_access_point () != row.ap) {
+                    var connections = nm_settings.list_connections ();
+                    var device_connections = wifi_device.filter_connections (connections);
+                    var ap_connections = row.ap.filter_connections (device_connections);
+
+                    var valid_connection = get_valid_connection (row.ap, ap_connections);
+                    if (valid_connection != null) {
+                        nm_client.activate_connection (valid_connection, wifi_device, row.ap.get_path (), null);
+                        return;
+                    }
+                    
                     var setting_wireless = new NM.SettingWireless ();
-                    if (setting_wireless.add_seen_bssid(row.ap.get_bssid ())) {
+                    if (setting_wireless.add_seen_bssid (row.ap.get_bssid ())) {
                         if (row.is_secured) {
                             var remote_settings = new NM.RemoteSettings (null);
 
@@ -138,18 +148,11 @@
                                 NM.Device dialog_device;
                                 NM.AccessPoint dialog_ap;
                                 var dialog_connection = dialog.get_connection (out dialog_device, out dialog_ap);
-
-                                if (get_connection_available (dialog_connection, dialog_device)) {
-                                    client.activate_connection (dialog_connection,
-                                                                dialog_device,
-                                                                dialog_ap.get_path (),
-                                                                null);                                    
-                                } else {
-                                    client.add_and_activate_connection (dialog_connection,
-                                                                        dialog_device,
-                                                                        dialog_ap.get_path (),
-                                                                        finish_connection_callback);
-                                }
+                                  
+                                client.add_and_activate_connection (dialog_connection,
+                                                                    dialog_device,
+                                                                    dialog_ap.get_path (),
+                                                                    finish_connection_callback);
                             }); 
 
                             dialog.run ();  
@@ -170,15 +173,14 @@
             }
         }
 
-        private bool get_connection_available (NM.Connection connection, NM.Device _device) {
-            bool retval = false;
-            _device.get_available_connections ().@foreach ((_connection) => {
-                if (_connection == connection) {
-                    retval = true;
-                } 
-            });
+        private NM.Connection? get_valid_connection (NM.AccessPoint ap, SList<weak NM.Connection> ap_connections) {
+            foreach (weak NM.Connection connection in ap_connections) {
+                if (ap.connection_valid (connection)) {
+                    return connection;
+                }
+            }
 
-            return retval;
+            return null;
         }
 
         private void finish_connection_callback (NM.Client _client,
@@ -187,11 +189,10 @@
                                                 Error error) {
             bool success = false;
             _client.get_active_connections ().@foreach ((c) => {
-                if (c == connection) 
+                if (c == connection) {
                     success = true;
+                }
             });
-
         }
-
     }
 }