diff options
| author |   Matt Ranostay <matt.ranostay@konsulko.com> | 2017-08-09 10:31:40 -0700 |
|---|---|---|
| committer | Matt Ranostay <matt.ranostay@konsulko.com> | 2017-08-09 17:34:14 -0700 |
| commit | c402cde6d71e73b905593b48ab4b83217f650195 (patch) | |
| tree | add7b52beb2e6c198220984a601951e7ef7b12a3 | |
| parent | 704266f16bb57155a7bd08f0956a8560e567a153 (diff) | |
qml: wifi: update subscription to events
Update the subscription to wifi events to the ne
more consistent format
Bug-AGL: SPEC-820
Change-Id: Ie38b9f6d0e43f402cc4db76f9c9349d54d5ace04
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
| -rw-r--r-- | app/wifi/Wifi.qml | 86 |
1 files changed, 10 insertions, 76 deletions
diff --git a/app/wifi/Wifi.qml b/app/wifi/Wifi.qml index d21cccc..77e0759 100644 --- a/app/wifi/Wifi.qml +++ b/app/wifi/Wifi.qml @@ -71,18 +71,17 @@ SettingPage { console.log("Received EVENT: " + eventContent.event) - if (eventContent.event === "wifi-manager/networkListUpdated") { + if (eventContent.event === "wifi-manager/networkList") { console.debug("Event data:" + eventContent.data.data1 + ", " + eventContent.data.data2 ) console.log("Network List was updated, sending scan_result request") //update network list verb_str = "scan_result" - var parameterJson = 'None' - sendSocketMesage(verb_str, parameterJson) + sendSocketMesage(verb_str, 'None') } - else if (eventContent.event === "wifi-manager/passkeyQuery") { + else if (eventContent.event === "wifi-manager/passkey") { console.debug("Event data:" + eventContent.data.data1 + ", " + eventContent.data.data2 ) console.log("Passkey requested") @@ -175,87 +174,22 @@ SettingPage { if (checked == true) { //subscribe for events - var parameterJson - - //network list updated event - verb_str = "eventadd" - parameterJson = { - tag: 'networkList', - name: 'networkListUpdated' - } - sendSocketMesage(verb_str, parameterJson) - - - //TODO: send this ONLY when OK response is received - verb_str = "eventsub" - parameterJson = { - tag: 'networkList' - } - sendSocketMesage(verb_str, parameterJson) - - - //passkey required event - verb_str = "eventadd" - parameterJson = { - tag: 'passkey', - name: 'passkeyQuery' - } - sendSocketMesage(verb_str, parameterJson) - - - //TODO: send this ONLY when OK response is received - verb_str = "eventsub" - parameterJson = { - tag: 'passkey' - } - sendSocketMesage(verb_str, parameterJson) - - - verb_str = "activate" - parameterJson = 'None' - sendSocketMesage(verb_str, parameterJson) - + sendSocketMesage("subscribe", { value: "networkList" }) + sendSocketMesage("subscribe", { value: "passkey" }) + sendSocketMesage("activate", 'None') //get scan results right away verb_str = "scan_result" - parameterJson = 'None' - sendSocketMesage(verb_str, parameterJson) + sendSocketMesage(verb_str, 'None') } else { if (!isInitializing) { - networkList.clear() - verb_str = "deactivate" - parameterJson = 'None' - sendSocketMesage(verb_str, parameterJson) - - - verb_str = "eventunsub" - parameterJson = { - tag: 'passkey' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventdel" - parameterJson = { - tag: 'passkey' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventunsub" - parameterJson = { - tag: 'networkList' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventdel" - parameterJson = { - tag: 'networkList' - } - sendSocketMesage(verb_str, parameterJson) - + sendSocketMesage("deactivate", 'None') + sendSocketMesage("unsubscribe", { value: "passkey" }) + sendSocketMesage("unsubscribe", { value: "networkList" }) } } isInitializing = false |