Merge lp:~lukas-kde/unity8/fixWifiAPIndicatorIcons into lp:unity8

[Lukáš Tinkl]

Fix wifi access point indicator items signal strength icon on desktop

Fix wifi access point indicator items signal strength icon on desktop

When running unity8 in a desktop session, the data coming from the indicator might be of type "uchar" - ASCII code point, instead of a plain string. Take care of converting the value to an integer accordingly.

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

[lp:~lukas-kde/unity8/fixWifiAPIndicatorIcons]

2098. By Lukáš Tinkl on 2015-12-14

merge trunk

2099. By Lukáš Tinkl on 2015-12-14

and now the actual fix :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2098
http://jenkins.qa.ubuntu.com/job/unity8-ci/6936/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5750
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/351/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1647
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/348
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5763
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5763/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26021
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/350
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26020

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6936/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Shouldn't really be using different types between nm-applet and indicator-network, but since it's in nm-applet already.
Can you please add a FIXME to get rid of it when we've switched back to indicator-network on desktop please.

review: Approve

[lp:~lukas-kde/unity8/fixWifiAPIndicatorIcons]

2100. By Lukáš Tinkl on 2015-12-14

add a FIXME comment for the future

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2099
http://jenkins.qa.ubuntu.com/job/unity8-ci/6938/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5754
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/353/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1649
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/350
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26029
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/128/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/352
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26030

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6938/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-10-26 09:59:50 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-12-14 15:58:37 +0000
@@ -564,7 +564,17 @@
             active: serverChecked
             secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
             adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
-            signalStrength: strengthAction.valid ? strengthAction.state : 0
+            signalStrength: {
+                if (strengthAction.valid) {
+                    var state = strengthAction.state; // handle both int and uchar
+                    // FIXME remove the special casing when we switch to indicator-network completely
+                    if (typeof state == "string") {
+                        return state.charCodeAt();
+                    }
+                    return state;
+                }
+                return 0;
+            }
             highlightWhenPressed: false
 
             onMenuModelChanged: {