@@ -90,6 +90,7 @@ LocalComponents.Page {
9090 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
9191 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
9292 readonly property bool isConnected: menuData && menuData.actionState
93+ readonly property bool isEnterprise: getExtendedProperty(extendedData, "xCanonicalWifiApIsEnterprise", false)
9394 readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0
9495 property int menuIndex: -1
9596
@@ -97,6 +98,7 @@ LocalComponents.Page {
9798 if (!unityMenuModel || menuIndex == -1) return;
9899 unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
99100 'x-canonical-wifi-ap-is-secure': 'bool',
101+ 'x-canonical-wifi-ap-is-enterprise': 'bool',
100102 'x-canonical-wifi-ap-strength-action': 'string'});
101103 }
102104
@@ -186,6 +188,7 @@ LocalComponents.Page {
186188
187189 readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
188190 readonly property bool isConnected: item && item.menuData && item.menuData.actionState
191+ readonly property bool isEnterprise: item && item.isEnterprise
189192
190193 height: !!sourceComponent ? (isConnected ? units.gu(9) : units.gu(7)) : 0
191194 anchors.left: parent.left
@@ -193,13 +196,10 @@ LocalComponents.Page {
193196
194197 asynchronous: true
195198 sourceComponent: {
196− if (isAccessPoint) {
197− menuModel.loadExtendedAttributes(index, {'x-canonical-wifi-ap-is-enterprise': 'bool'}); // filter out enterprise wifis, lpbug:#1475023
198− if (!getExtendedProperty(menuModel.ext, "xCanonicalWifiApIsEnterprise", false)) {
199− return accessPointComponent;
200− }
201− return null;
199+ if (isAccessPoint && !isEnterprise) {
200+ return accessPointComponent;
202201 }
202+ return null;
203203 }
204204
205205 onLoaded: {