summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-02 16:51:12 -0500
committerScott Murray <scott.murray@konsulko.com>2020-01-03 15:52:28 +0000
commitc9c9e1d5ab372f1abd982072644766b008a384f0 (patch)
tree16d244de0faa9f658344e5bfdaf0a0755045ac9a
parentb57a3197dad42bdd7a72266aaa160341573b0627 (diff)
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 <scott.murray@konsulko.com> Change-Id: I47b6369d9924102252c4690dda38d721276c69b8 (cherry picked from commit f9fd82d04fba32b9f540f592bfa8b49d60e63851)
-rw-r--r--homescreen/src/chromecontroller.cpp2
1 files changed, 1 insertions, 1 deletions
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.";