From 704266f16bb57155a7bd08f0956a8560e567a153 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Tue, 8 Aug 2017 19:22:58 -0700 Subject: qml: bluetooth: update subscription to events Update the subscription to bluetooth events to the new more consistent format Bug-AGL: SPEC-819 Change-Id: I4236ca5f018be42d58f474220c418354437721f4 Signed-off-by: Matt Ranostay --- app/bluetooth/Bluetooth.qml | 57 ++++----------------------------------------- 1 file changed, 4 insertions(+), 53 deletions(-) (limited to 'app/bluetooth') diff --git a/app/bluetooth/Bluetooth.qml b/app/bluetooth/Bluetooth.qml index 71e3635..666069c 100644 --- a/app/bluetooth/Bluetooth.qml +++ b/app/bluetooth/Bluetooth.qml @@ -103,59 +103,10 @@ SettingPage { if (verb_str == "connect"){ WebSocket.sendTextMessage (request_str) } - - verb_str = "eventadd" - parameterJson = { - tag: 'device_updated', - name: 'device_updated' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventsub" - parameterJson = { - tag: 'device_updated' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventadd" - parameterJson = { - tag: 'device_added', - name: 'device_added' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventsub" - parameterJson = { - tag: 'device_added' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventadd" - parameterJson = { - tag: 'device_removed', - name: 'device_removed' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventsub" - parameterJson = { - tag: 'device_removed' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventadd" - parameterJson = { - tag: 'request_confirmation', - name: 'request_confirmation' - } - sendSocketMesage(verb_str, parameterJson) - - verb_str = "eventsub" - parameterJson = { - tag: 'request_confirmation' - } - sendSocketMesage(verb_str, parameterJson) - + sendSocketMesage("subscribe", { value: "device_updated" }) + sendSocketMesage("subscribe", { value: "device_added" }) + sendSocketMesage("subscribe", { value: "device_removed" }) + sendSocketMesage("subscribe", { value: "request_confirmation" }) } else if (websocket.status == WebSocket.Closed) { status_str = "Socket closed" } -- cgit