From 377766b0436f64ce7b3bda50e3547e5148cde6aa Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 18 Jun 2018 13:10:15 +0200
Subject: [PATCH] fix misinterpretation of notifications with id 0

might happen for hte very first connection after a nymead startup
---
 libmea-core/jsonrpc/jsonrpcclient.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libmea-core/jsonrpc/jsonrpcclient.cpp b/libmea-core/jsonrpc/jsonrpcclient.cpp
index 1221b784..f605d348 100644
--- a/libmea-core/jsonrpc/jsonrpcclient.cpp
+++ b/libmea-core/jsonrpc/jsonrpcclient.cpp
@@ -269,7 +269,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data)
 
 
     // Check if this is the initial handshake
-    if (dataMap.value("id").toInt() == 0 && dataMap.contains("params")) {
+    if (dataMap.value("id").toInt() == 0 && dataMap.contains("params") && !dataMap.contains("notification")) {
         dataMap = dataMap.value("params").toMap();
         m_initialSetupRequired = dataMap.value("initialSetupRequired").toBool();
         m_authenticationRequired = dataMap.value("authenticationRequired").toBool();
@@ -286,6 +286,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data)
         QVersionNumber minimumRequiredVersion = QVersionNumber(1, 0);
         QVersionNumber protocolVersion = QVersionNumber::fromString(protoVersionString);
         if (protocolVersion < minimumRequiredVersion) {
+            qWarning() << "Nymea box doesn't support minimum required version. Required:" << minimumRequiredVersion << "Found:" << protocolVersion;
             m_connection->disconnect();
             emit invalidProtocolVersion(protocolVersion.toString(), minimumRequiredVersion.toString());
             return;