Merge lp:~cimi/ubuntu-system-settings/fix-1363400 into lp:ubuntu-system-settings/rtm-14.09

[Andrea Cimitan]

Fix continue button in wifi wizard page, adds qml-module-qtsysteminfo as ubuntu-system-settings-wizard dep

The vivid part of this lives at https://code.launchpad.net/~cimi/unity8/fix-1363400/+merge/247129

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
no
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
no
 * Has your component "TestPlan” been executed successfully on emulator, N4?
Tested manually the change on my device
 * Has a 5 minute exploratory testing run been executed on N4?
no
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
will do soon
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
n/a
 * What components might get impacted by your changes?
wizard
 * Have you requested review by the teams of these owning components?
doing now

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:966
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/38/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/39/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/17
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17285

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

I tested this on mako, with rtm image 174. I verified qml-module-qtsysteminfo is installed, but after connecting to wifi the skip button remains, no continue button.

review: Needs Fixing

[Ken VanDine (ken-vandine)]

why not call getAccessPointName in onNetworkStatusChanged if the status was HomeNetwork, instead of in onNetworkNameChanged?

[Ken VanDine (ken-vandine)]

I did a little hacking here, the NetworkInfo API isn't very QML friendly. I've proposed a fix that ensures the accessPointName gets set, it's a little hacky though.

https://code.launchpad.net/~ken-vandine/ubuntu-system-settings/fix-1363400/+merge/247341

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

967. By Andrea Cimitan on 2015-01-23

Should fix rtm on mako

[Andrea Cimitan (cimi)]

> why not call getAccessPointName in onNetworkStatusChanged if the status was
> HomeNetwork, instead of in onNetworkNameChanged?
that's a good question, originally I wanted to update the network name when it changes, I am confused by networkStatus possible values, onNetworkNameChanged guarantees to update when the wifi connection changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/21
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17382

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/42/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

> > why not call getAccessPointName in onNetworkStatusChanged if the status was
> > HomeNetwork, instead of in onNetworkNameChanged?
> that's a good question, originally I wanted to update the network name when it
> changes, I am confused by networkStatus possible values, onNetworkNameChanged
> guarantees to update when the wifi connection changes

The problem is when it changes, the other properties aren't guaranteed yet. I think this is a buggy API, we shouldn't expect the properties to all be updated when we get the signal.

[Ken VanDine (ken-vandine)]

Using the onCurrentNetworkChanged signal as well does indeed fix it. I still worry about this about this API a bit, it's the best we can do without digging deep into QtSystemInfo.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-01-14 20:43:55 +0000
+++ debian/control	2015-01-23 10:04:48 +0000
@@ -99,6 +99,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         qml-module-qtsysteminfo,
          ubuntu-system-settings (= ${binary:Version}),
          unity8 (>= 8.01),
 Recommends: qtdeclarative5-qtmir-plugin (>= 0.4)

=== modified file 'wizard/qml/Pages/40-wifi.qml'
--- wizard/qml/Pages/40-wifi.qml	2014-10-07 13:06:50 +0000
+++ wizard/qml/Pages/40-wifi.qml	2015-01-23 10:04:48 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import QMenuModel 0.1 as QMenuModel
+import QtSystemInfo 5.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.Wizard.Utils 0.1
@@ -27,7 +28,7 @@
     title: i18n.tr("Connect to Wi‑Fi")
     forwardButtonSourceComponent: forwardButton
 
-    readonly property bool connected: mainMenu.connectedAPs === 1
+    readonly property bool connected: networkInfo.accessPointName
 
     function getExtendedProperty(object, propertyName, defaultValue) {
         if (object && object.hasOwnProperty(propertyName)) {
@@ -43,6 +44,29 @@
         menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
     }
 
+    NetworkInfo {
+        id: networkInfo
+
+        property string accessPointName: getAccessPointName()
+
+        monitorCurrentNetworkMode: true
+        monitorNetworkName: true
+        monitorNetworkStatus: true
+
+        onCurrentNetworkModeChanged: getAccessPointName()
+        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 {
         id: accessPointComponent
         ListItem.Standard {
@@ -118,11 +142,6 @@
             onCheckedChanged: {
                 // Can't rely on binding. Checked is assigned on click.
                 checkBoxActive.checked = checked;
-                if (checked) {
-                    mainMenu.connectedAPs++
-                } else {
-                    mainMenu.connectedAPs--
-                }
             }
             onActivate: unityMenuModel.activate(menuIndex);
         }
@@ -164,9 +183,6 @@
                 Repeater {
                     id: mainMenu
 
-                    // FIXME Check connection better https://bugs.launchpad.net/indicator-network/+bug/1349371
-                    property int connectedAPs: 0
-
                     model: menuModel
 
                     delegate: Loader {