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

properly clean up AWS devices when they disappear from the cloud

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-07 13:09:11 +02:00
parent cced87831c
commit ad3e12d308
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libnymea-app-core/connection/awsclient.cpp
View File

@ -724,6 +724,8 @@ void AWSClient::getCredentialsForIdentity(const QString &identityId)
fetchDevices(); fetchDevices();
} else if (qc.method == "postToMQTT") { } else if (qc.method == "postToMQTT") {
postToMQTT(qc.boxId, qc.timestamp, qc.callback); postToMQTT(qc.boxId, qc.timestamp, qc.callback);
} else if (qc.method == "deleteAccount") {
deleteAccount();
} }
} }
}); });
@ -836,6 +838,7 @@ void AWSClient::fetchDevices()
qWarning() << "Failed to parse JSON from server" << error.errorString() << qUtf8Printable(data); qWarning() << "Failed to parse JSON from server" << error.errorString() << qUtf8Printable(data);
return; return;
} }
QList<QUuid> actualDevices;
foreach (const QVariant &entry, jsonDoc.toVariant().toMap().value("devices").toList()) { foreach (const QVariant &entry, jsonDoc.toVariant().toMap().value("devices").toList()) {
QString deviceId = entry.toMap().value("deviceId").toString(); QString deviceId = entry.toMap().value("deviceId").toString();
QString name = entry.toMap().value("name").toString(); QString name = entry.toMap().value("name").toString();
@ -848,6 +851,18 @@ void AWSClient::fetchDevices()
m_devices->insert(d); m_devices->insert(d);
} }
d->setOnline(online); d->setOnline(online);
actualDevices.append(d->id());
}
// Clean up the model
QStringList devicesToRemove;
for (int i = 0; i < m_devices->rowCount(); i++) {
if (!actualDevices.contains(m_devices->get(i)->id())) {
devicesToRemove.append(m_devices->get(i)->id());
}
}
while (!devicesToRemove.isEmpty()) {
m_devices->remove(devicesToRemove.takeFirst());
} }
emit devicesFetched(); emit devicesFetched();