ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix an issue where it might happen that a notification breaks a reply

Browse Source
This commit is contained in:
Michael Zanetti 2018-10-05 01:09:25 +02:00
parent e06ff3ca01
commit 2cf07bcc35
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libnymea-app-core/jsonrpc/jsonrpcclient.cpp
View File

@ -397,6 +397,22 @@ void JsonRpcClient::dataReceived(const QByteArray &data)
getCloudConnectionStatus(); getCloudConnectionStatus();
} }
// check if this is a notification
if (dataMap.contains("notification")) {
QStringList notification = dataMap.value("notification").toString().split(".");
QString nameSpace = notification.first();
JsonHandler *handler = m_notificationHandlers.value(nameSpace).first;
if (!handler) {
// qWarning() << "JsonRpc: handler not implemented:" << nameSpace;
return;
}
// qDebug() << "Incoming notification:" << jsonDoc.toJson();
QMetaObject::invokeMethod(handler, m_notificationHandlers.value(nameSpace).second.toLatin1().data(), Q_ARG(QVariantMap, dataMap));
return;
}
// check if this is a reply to a request // check if this is a reply to a request
int commandId = dataMap.value("id").toInt(); int commandId = dataMap.value("id").toInt();
JsonRpcReply *reply = m_replies.take(commandId); JsonRpcReply *reply = m_replies.take(commandId);
@ -422,21 +438,6 @@ void JsonRpcClient::dataReceived(const QByteArray &data)
emit responseReceived(reply->commandId(), dataMap.value("params").toMap()); emit responseReceived(reply->commandId(), dataMap.value("params").toMap());
return; return;
} }
// check if this is a notification
if (dataMap.contains("notification")) {
QStringList notification = dataMap.value("notification").toString().split(".");
QString nameSpace = notification.first();
JsonHandler *handler = m_notificationHandlers.value(nameSpace).first;
if (!handler) {
// qWarning() << "JsonRpc: handler not implemented:" << nameSpace;
return;
}
// qDebug() << "Incoming notification:" << jsonDoc.toJson();
QMetaObject::invokeMethod(handler, m_notificationHandlers.value(nameSpace).second.toLatin1().data(), Q_ARG(QVariantMap, dataMap));
}
} }
JsonRpcReply::JsonRpcReply(int commandId, QString nameSpace, QString method, QVariantMap params, QPointer<QObject> caller, const QString &callback): JsonRpcReply::JsonRpcReply(int commandId, QString nameSpace, QString method, QVariantMap params, QPointer<QObject> caller, const QString &callback):