From f9fd82d04fba32b9f540f592bfa8b49d60e63851 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 2 Jan 2020 16:51:12 -0500 Subject: Remove workaround for broken vshl-core event JSON Now that the broken event argument JSON from the vshl-core binding has a fix, the workaround of reparsing the voice event arguments needs to be removed, as it breaks with the corrected events. Bug-AGL: SPEC-3084 Signed-off-by: Scott Murray Change-Id: I47b6369d9924102252c4690dda38d721276c69b8 --- homescreen/src/chromecontroller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homescreen/src/chromecontroller.cpp b/homescreen/src/chromecontroller.cpp index 34895bf..e944b2d 100644 --- a/homescreen/src/chromecontroller.cpp +++ b/homescreen/src/chromecontroller.cpp @@ -116,7 +116,7 @@ ChromeController::ChromeController(const QUrl &bindingUrl, QObject *parent) : connect(m_aglSocket, &AglSocketWrapper::eventReceived, this, [this](const QString &eventName, const QJsonValue &data) -> void { if (eventName.compare(vshl::VOICE_DIALOG_STATE_EVENT + m_voiceAgentId) == 0) { - const QJsonObject dataObj = QJsonDocument::fromJson(data.toString().toUtf8()).object(); + const QJsonObject dataObj = data.toObject(); auto objIt = dataObj.find(vshl::STATE_TAG); if (objIt == dataObj.constEnd()) { qWarning() << "Voice dialog state event state missing."; -- cgit 1.2.3-korg