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

fixed custom key removal

master
Boernsman 2020-11-02 12:12:41 +01:00
parent 5ffe1000dc
commit 33a254df9c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
aqi/integrationpluginaqi.cpp
View File

@ -42,6 +42,14 @@ IntegrationPluginAqi::IntegrationPluginAqi()
if (!value.toString().isEmpty()) { if (!value.toString().isEmpty()) {
qCDebug(dcAirQualityIndex()) << "Custom API key updated"; qCDebug(dcAirQualityIndex()) << "Custom API key updated";
m_aqiConnection->setApiKey(value.toString()); m_aqiConnection->setApiKey(value.toString());
} else {
qCDebug(dcAirQualityIndex()) << "Custom API key has been deleted";
QString apiKey = apiKeyStorage()->requestKey("aqi").data("apiKey");
if (apiKey.isEmpty()) {
qCWarning(dcApiKeys()) << "No API Key is available, keeping the AQI connection as it is";
} else {
m_aqiConnection->setApiKey(apiKey);
}
} }
} }
}); });
@ -233,7 +241,6 @@ void IntegrationPluginAqi::onPluginTimer()
return; return;
foreach (Thing *thing, myThings().filterByThingClassId(airQualityIndexThingClassId)) { foreach (Thing *thing, myThings().filterByThingClassId(airQualityIndexThingClassId)) {
double longitude = thing->paramValue(airQualityIndexThingLongitudeParamTypeId).toDouble(); double longitude = thing->paramValue(airQualityIndexThingLongitudeParamTypeId).toDouble();
double latitude = thing->paramValue(airQualityIndexThingLatitudeParamTypeId).toDouble(); double latitude = thing->paramValue(airQualityIndexThingLatitudeParamTypeId).toDouble();
QUuid requestId = m_aqiConnection->getDataByGeolocation(latitude, longitude); QUuid requestId = m_aqiConnection->getDataByGeolocation(latitude, longitude);
@ -247,6 +254,10 @@ void IntegrationPluginAqi::onRequestExecuted(QUuid requestId, bool success)
if (m_asyncDiscovery.contains(requestId) && !success) { if (m_asyncDiscovery.contains(requestId) && !success) {
ThingDiscoveryInfo *info = m_asyncDiscovery.take(requestId); ThingDiscoveryInfo *info = m_asyncDiscovery.take(requestId);
info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Air quality index server not available, please check your internet connection.")); info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Air quality index server not available, please check your internet connection."));
if (myThings().filterByThingClassId(airQualityIndexThingClassId).isEmpty() && m_aqiConnection) {
m_aqiConnection->deleteLater();
m_aqiConnection = nullptr;
}
} }
if (m_asyncRequests.contains(requestId)) { if (m_asyncRequests.contains(requestId)) {