git.iko.soy/unity8
on xenial help sign in
fix AP connected state check
d8724d2Lukáš Tinkl
qml/Wizard/Pages/30-wifi.qml+3−27
compare with xenial
unifiedsplit
@@ -16,9 +16,9 @@
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18import QMenuModel 0.1 as QMenuModel
18import QMenuModel 0.1 as QMenuModel
19−import QtSystemInfo 5.0
20import Ubuntu.Components 1.2
19import Ubuntu.Components 1.2
21import Ubuntu.Settings.Menus 0.1 as Menus
20import Ubuntu.Settings.Menus 0.1 as Menus
21+import Wizard 0.1
22import ".." as LocalComponents
22import ".." as LocalComponents
23
23
24LocalComponents.Page {
24LocalComponents.Page {
@@ -28,7 +28,7 @@ LocalComponents.Page {
28 title: i18n.tr("Connect to Wi‑Fi")
28 title: i18n.tr("Connect to Wi‑Fi")
29 forwardButtonSourceComponent: forwardButton
29 forwardButtonSourceComponent: forwardButton
30
30
31− readonly property bool connected: networkInfo.accessPointName
31+ readonly property bool connected: Status.online
32
32
33 function getExtendedProperty(object, propertyName, defaultValue) {
33 function getExtendedProperty(object, propertyName, defaultValue) {
34 if (object && object.hasOwnProperty(propertyName)) {
34 if (object && object.hasOwnProperty(propertyName)) {
@@ -67,30 +67,6 @@ LocalComponents.Page {
67 menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
67 menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
68 }
68 }
69
69
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−
94 Component {
70 Component {
95 id: accessPointComponent
71 id: accessPointComponent
96 ListItem {
72 ListItem {
@@ -109,7 +85,7 @@ LocalComponents.Page {
109 }
85 }
110 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
86 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
111 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
87 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
113 property int signalStrength: strengthAction.valid ? strengthAction.state : 0
89 property int signalStrength: strengthAction.valid ? strengthAction.state : 0
114 property int menuIndex: -1
90 property int menuIndex: -1
115
91