Merge lp:~ken-vandine/ubuntu-system-settings/lp1472505 into lp:ubuntu-system-settings

[Ken VanDine]

[wifi] Fixed handling of loading extended attributes from the MenuModel

[wifi] Fixed handling of loading extended attributes from the MenuModel

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1466
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2188/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/49
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/302
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/302/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21760

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM! Thanks!

review: Approve

=== modified file 'plugins/wifi/MenuItemFactory.qml'
--- plugins/wifi/MenuItemFactory.qml	2015-04-20 15:08:41 +0000
+++ plugins/wifi/MenuItemFactory.qml	2015-07-09 15:16:36 +0000
@@ -40,6 +40,13 @@
         "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
     }
 
+    function getExtendedProperty(object, propertyName, defaultValue) {
+        if (object && object.hasOwnProperty(propertyName)) {
+            return object[propertyName];
+        }
+        return defaultValue;
+    }
+
     Component { id: divMenu; DivMenuItem {} }
 
     Component {
@@ -95,13 +102,22 @@
         id: wifiSection;
         SectionMenuItem {
             property QtObject menu: null
+            property var menuModel: menuFactory.menuModel
             property int menuIndex: -1
-
+            property var extendedData: menu && menu.ext || undefined
             text: menu && menu.label ? menu.label : ""
-            busy: menu ? menu.ext.xCanonicalBusyAction : false
-
-            Component.onCompleted: {
-                model.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'});
+            busy: getExtendedProperty(extendedData, "xCanonicalBusyAction", false)
+
+            onMenuModelChanged: {
+                loadAttributes();
+            }
+            onMenuIndexChanged: {
+                loadAttributes();
+            }
+
+            function loadAttributes() {
+                if (!menuModel || menuIndex == undefined) return;
+                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'})
             }
         }
     }
@@ -111,24 +127,27 @@
         AccessPoint {
             id: apItem
             property QtObject menu: null
+            property var menuModel: menuFactory.model
             property int menuIndex: -1
+            property var extendedData: menu && menu.ext || undefined
             property var strenthAction: QMenuModel.UnityMenuAction {
-                model: menuFactory.model ? menuFactory.model : null
-                name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""
+                model: menuModel ? menuModel : null
+                name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
             }
             property bool serverChecked: menu && menu.isToggled || false
 
             text: menu && menu.label ? menu.label : ""
-            secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false
-            adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false
+            secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
+            adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
             checked: serverChecked
             signalStrength: strenthAction.valid ? strenthAction.state : 0
             enabled: menu ? menu.sensitive : false
 
-            Component.onCompleted: {
-                model.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
-                                                         'x-canonical-wifi-ap-is-secure': 'bool',
-                                                         'x-canonical-wifi-ap-strength-action': 'string'});
+            onMenuModelChanged: {
+                loadAttributes();
+            }
+            onMenuIndexChanged: {
+                loadAttributes();
             }
 
             USC.ServerPropertySynchroniser {
@@ -140,6 +159,13 @@
 
                 onSyncTriggered: model.activate(apItem.menuIndex)
             }
+
+            function loadAttributes() {
+                if (!model || menuIndex == undefined) return;
+                model.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
+                                                         'x-canonical-wifi-ap-is-secure': 'bool',
+                                                         'x-canonical-wifi-ap-strength-action': 'string'});
+            }
         }
     }