Remove workaround for broken vshl-core event JSON

[apps/homescreen.git] / homescreen / src / chromecontroller.cpp

diff --git a/homescreen/src/chromecontroller.cpp b/homescreen/src/chromecontroller.cpp
index b604dae..e944b2d 100644 (file)
--- a/homescreen/src/chromecontroller.cpp
+++ b/homescreen/src/chromecontroller.cpp
@@ -64,6 +64,11 @@ ChromeController::ChromeController(const QUrl &bindingUrl, QObject *parent) :
                             continue;
                         if (agentId.compare(agentIt.value().toString()) == 0) {
                             agentFound = true;
+                            auto nameIt = agentObj.find(vshl::NAME_TAG);
+                            if (nameIt != agentObj.constEnd()) {
+                                m_voiceAgentName = nameIt.value().toString();
+                                emit agentNameChanged();
+                            }
                             break;
                         }
                     }
@@ -111,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.";