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

close #325

Browse Source
This commit is contained in:
Simon Stürz 2016-05-12 10:55:42 +02:00 committed by Michael Zanetti
parent fac55da898
commit 9076f0ae72
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/jsonrpc/devicehandler.cpp
View File

@ -160,7 +160,8 @@ DeviceHandler::DeviceHandler(QObject *parent) :
setReturns("ConfirmPairing", returns); setReturns("ConfirmPairing", returns);
params.clear(); returns.clear(); params.clear(); returns.clear();
setDescription("GetConfiguredDevices", "Returns a list of configured devices."); setDescription("GetConfiguredDevices", "Returns a list of configured devices, optionally filtered by deviceId.");
params.insert("o:deviceId", JsonTypes::basicTypeToString(JsonTypes::Uuid));
setParams("GetConfiguredDevices", params); setParams("GetConfiguredDevices", params);
QVariantList devices; QVariantList devices;
devices.append(JsonTypes::deviceRef()); devices.append(JsonTypes::deviceRef());
@ -458,11 +459,20 @@ JsonReply *DeviceHandler::ConfirmPairing(const QVariantMap &params)
JsonReply* DeviceHandler::GetConfiguredDevices(const QVariantMap &params) const JsonReply* DeviceHandler::GetConfiguredDevices(const QVariantMap &params) const
{ {
Q_UNUSED(params)
QVariantMap returns; QVariantMap returns;
QVariantList configuredDeviceList; QVariantList configuredDeviceList;
foreach (Device *device, GuhCore::instance()->deviceManager()->configuredDevices()) { if (params.contains("deviceId")) {
configuredDeviceList.append(JsonTypes::packDevice(device)); Device *device = GuhCore::instance()->deviceManager()->findConfiguredDevice(DeviceId(params.value("deviceId").toString()));
if (!device) {
returns.insert("deviceError", JsonTypes::deviceErrorToString(DeviceManager::DeviceErrorDeviceNotFound));
return createReply(returns);
} else {
configuredDeviceList.append(JsonTypes::packDevice(device));
}
} else {
foreach (Device *device, GuhCore::instance()->deviceManager()->configuredDevices()) {
configuredDeviceList.append(JsonTypes::packDevice(device));
}
} }
returns.insert("devices", configuredDeviceList); returns.insert("devices", configuredDeviceList);
return createReply(returns); return createReply(returns);