Merge lp:~ken-vandine/ubuntu-system-settings/fix-1363400 into lp:~cimi/ubuntu-system-settings/fix-1363400

[Ken VanDine]

Ensure accessPointName gets set when status and currentMode changes too.

Ensure accessPointName gets set when status and currentMode changes too.

[lp:~ken-vandine/ubuntu-system-settings/fix-1363400]

968. By Ken VanDine on 2015-01-22

More QML friendly

[Andrea Cimitan (cimi)]

we can not rely on currentNetworkMode to change, since it doesn't (try on desktop), and networkStatus and networkName are not bindings, so it doesn't get retriggered and updated when you switch wifi

review: Disapprove

[Sebastien Bacher (seb128)]

the bug mentioned in the url is fixed, is that still current or should it be closed?

review: Needs Information

[Sebastien Bacher (seb128)]

Ken?

Unmerged revisions

968. By Ken VanDine on 2015-01-22

More QML friendly

967. By Ken VanDine on 2015-01-22

Ensure accessPointName gets set when status and currentMode changes too.

=== modified file 'wizard/qml/Pages/40-wifi.qml'
--- wizard/qml/Pages/40-wifi.qml	2015-01-21 12:56:33 +0000
+++ wizard/qml/Pages/40-wifi.qml	2015-01-22 18:35:20 +0000
@@ -47,23 +47,11 @@
     NetworkInfo {
         id: networkInfo
 
-        property string accessPointName: getAccessPointName()
+        property string accessPointName: (networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork) && (currentNetworkMode === NetworkInfo.WlanMode) ? networkName(NetworkInfo.WlanMode, 0) : ""
 
         monitorCurrentNetworkMode: true
         monitorNetworkName: true
         monitorNetworkStatus: true
-
-        onNetworkNameChanged: getAccessPointName()
-        onNetworkStatusChanged: if (status !== NetworkInfo.HomeNetwork) accessPointName = ""
-
-        function getAccessPointName() {
-            // 0 is the interface
-            if (currentNetworkMode === NetworkInfo.WlanMode &&
-                networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
-                accessPointName = networkName(NetworkInfo.WlanMode, 0);
-            else
-                accessPointName = "";
-        }
     }
 
     Component {