@@ -16,9 +16,9 @@
1616
1717import QtQuick 2.3
1818import QMenuModel 0.1 as QMenuModel
19−import QtSystemInfo 5.0
2019import Ubuntu.Components 1.2
2120import Ubuntu.Settings.Menus 0.1 as Menus
21+import Wizard 0.1
2222import ".." as LocalComponents
2323
2424LocalComponents.Page {
@@ -28,7 +28,7 @@ LocalComponents.Page {
2828 title: i18n.tr("Connect to Wi‑Fi")
2929 forwardButtonSourceComponent: forwardButton
3030
31− readonly property bool connected: networkInfo.accessPointName
31+ readonly property bool connected: Status.online
3232
3333 function getExtendedProperty(object, propertyName, defaultValue) {
3434 if (object && object.hasOwnProperty(propertyName)) {
@@ -67,30 +67,6 @@ LocalComponents.Page {
6767 menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
6868 }
6969
70− NetworkInfo {
71− id: networkInfo
72−
73− property string accessPointName
74−
75− monitorCurrentNetworkMode: true
76− monitorNetworkName: true
77− monitorNetworkStatus: true
78−
79− onCurrentNetworkModeChanged: getAccessPointName()
80− onNetworkNameChanged: getAccessPointName()
81− onNetworkStatusChanged: if (status !== NetworkInfo.HomeNetwork) accessPointName = ""
82−
83− Component.onCompleted: getAccessPointName()
84−
85− function getAccessPointName() {
86− // 0 is the interface
87− if (currentNetworkMode === NetworkInfo.WlanMode && networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
88− accessPointName = networkName(NetworkInfo.WlanMode, 0);
89− else
90− accessPointName = "";
91− }
92− }
93−
9470 Component {
9571 id: accessPointComponent
9672 ListItem {
@@ -109,7 +85,7 @@ LocalComponents.Page {
10985 }
11086 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
11187 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
112− readonly property bool isConnected: menuData && menuData.label === networkInfo.accessPointName
88+ readonly property bool isConnected: menuData && menuData.actionState
11389 property int signalStrength: strengthAction.valid ? strengthAction.state : 0
11490 property int menuIndex: -1
11591