Merge lp:~lukas-kde/ubuntu-system-settings/ap-signal-strength into lp:ubuntu-system-settings

[Lukáš Tinkl]

Fix WIFI APs signal strength icons

Fix WIFI APs signal strength icons

Correctly handle both uchar (byte on DBUS) and integers when evaluating the strength and converting it to an integer.

[Jonas G. Drange (jonas-drange)]

great, thank you!

review: Approve

=== modified file 'plugins/wifi/MenuItemFactory.qml'
--- plugins/wifi/MenuItemFactory.qml	2016-07-14 13:51:56 +0000
+++ plugins/wifi/MenuItemFactory.qml	2016-12-15 15:16:19 +0000
@@ -130,7 +130,7 @@
             property var menuModel: menuFactory.model
             property int menuIndex: -1
             property var extendedData: menu && menu.ext || undefined
-            property var strenthAction: QMenuModel.UnityMenuAction {
+            property var strengthAction: QMenuModel.UnityMenuAction {
                 model: menuModel ? menuModel : null
                 name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
             }
@@ -140,7 +140,16 @@
             secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
             adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
             checked: serverChecked
-            signalStrength: strenthAction.valid ? strenthAction.state : 0
+            signalStrength: {
+                if (strengthAction.valid) {
+                    var state = strengthAction.state; // handle both int and uchar
+                    if (typeof state == "string") {
+                        return state.charCodeAt();
+                    }
+                    return state;
+                }
+                return 0;
+            }
             enabled: menu ? menu.sensitive : false
 
             onMenuModelChanged: {