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

fix discovery response in json

Browse Source
This commit is contained in:
Michael Zanetti 2014-04-14 00:16:08 +02:00
parent 60693ccb69
commit 33e64038fa
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/jsonrpc/devicehandler.cpp
View File

@ -154,6 +154,7 @@ DeviceHandler::DeviceHandler(QObject *parent) :
setParams("StateChanged", params); setParams("StateChanged", params);
connect(GuhCore::instance()->deviceManager(), &DeviceManager::deviceStateChanged, this, &DeviceHandler::deviceStateChanged); connect(GuhCore::instance()->deviceManager(), &DeviceManager::deviceStateChanged, this, &DeviceHandler::deviceStateChanged);
connect(GuhCore::instance()->deviceManager(), &DeviceManager::devicesDiscovered, this, &DeviceHandler::devicesDiscovered);
} }
QString DeviceHandler::name() const QString DeviceHandler::name() const

6
server/jsonrpc/jsontypes.cpp
View File

@ -396,6 +396,12 @@ QPair<bool, QString> JsonTypes::validateVariant(const QVariant &templateVariant,
qDebug() << "device not valid"; qDebug() << "device not valid";
return result; return result;
} }
} else if (refName == deviceDescriptorRef()) {
QPair<bool, QString> result = validateMap(deviceDescriptorDescription(), variant.toMap());
if (!result.first) {
qDebug() << "devicedescription not valid";
return result;
}
} else if (refName == vendorRef()) { } else if (refName == vendorRef()) {
QPair<bool, QString> result = validateMap(vendorDescription(), variant.toMap()); QPair<bool, QString> result = validateMap(vendorDescription(), variant.toMap());
if (!result.first) { if (!result.first) {