ETM-Schurig
/
nymea-plugins
mirror of https://github.com/nymea/nymea-plugins.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

added more debug information

pull/332/head
Boernsman 2020-12-07 09:51:36 +01:00
parent 4e69b26888
commit 58e65a0420
3 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tado/integrationplugintado.cpp
View File

@ -45,15 +45,17 @@ IntegrationPluginTado::IntegrationPluginTado()
void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
{
// Checking the internet connection
qCDebug(dcTado()) << "Start pairing process, checking the internet connection ...";
NetworkAccessManager *network = hardwareManager()->networkManager();
QNetworkReply *reply = network->get(QNetworkRequest(QUrl("https://my.tado.com/api/v2")));
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, info, [reply, info] {
if (reply->error() == QNetworkReply::NetworkError::HostNotFoundError) {
qCWarning(dcTado()) << "Tado server is not reachable, likely because of a missing internet connection.";
info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Tado server is not reachable."));
} else {
qCDebug(dcTado()) << "Internet connection available";
info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the login credentials for your Tado account."));
}
});
@ -72,9 +74,13 @@ void IntegrationPluginTado::confirmPairing(ThingPairingInfo *info, const QString
});
connect(tado, &Tado::connectionError, info, [info] (QNetworkReply::NetworkError error){
if (error != QNetworkReply::NetworkError::NoError){
if (error == QNetworkReply::NetworkError::ProtocolInvalidOperationError) {
qCWarning(dcTado()) << "Confirm pairing failed, wrong username or password";
info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("Wrong username or password."));
} else if (error != QNetworkReply::NetworkError::NoError){
qCWarning(dcTado()) << "Confirm pairing failed" << error;
info->finish(Thing::ThingErrorSetupFailed, tr("Connection error"));
info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("Connection error"));
}
// info->finish(success) will be called after the token has been received
});
@ -83,7 +89,7 @@ void IntegrationPluginTado::confirmPairing(ThingPairingInfo *info, const QString
if (success) {
tado->getToken(password);
} else {
info->finish(Thing::ThingErrorAuthenticationFailure, "Client credentials not found, the plug-in version might be outdated.");
info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Client credentials not found, the plug-in version might be outdated."));
}
});
@ -138,13 +144,21 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
info->finish(Thing::ThingErrorNoError);
});
connect(tado, &Tado::connectionError, info, [this, info] (QNetworkReply::NetworkError error){
connect(tado, &Tado::connectionError, info, [this, info] (QNetworkReply::NetworkError error) {
if (error != QNetworkReply::NetworkError::NoError){
if (m_tadoAccounts.contains(info->thing()->id())) {
Tado *tado = m_tadoAccounts.take(info->thing()->id());
tado->deleteLater();
}
info->finish(Thing::ThingErrorSetupFailed);
if (error == QNetworkReply::NetworkError::ProtocolInvalidOperationError) {
qCWarning(dcTado()) << "Confirm pairing failed, wrong username or password";
info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("Wrong username or password."));
} else {
qCWarning(dcTado()) << "Confirm pairing failed" << error;
info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("Connection error"));
}
}
});
tado->getApiCredentials();

18
tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de.ts
View File

@ -4,20 +4,32 @@
<context>
<name>IntegrationPluginTado</name>
<message>
<location filename="../integrationplugintado.cpp" line="55"/>
<location filename="../integrationplugintado.cpp" line="56"/>
<source>Tado server is not reachable.</source>
<translation>Tado-Server ist nicht erreichbar.</translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="57"/>
<location filename="../integrationplugintado.cpp" line="59"/>
<source>Please enter the login credentials for your Tado account.</source>
<translation>Bitte geben Sie die Anmeldeinformationen für Ihr Tado-Konto ein.</translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="77"/>
<location filename="../integrationplugintado.cpp" line="80"/>
<location filename="../integrationplugintado.cpp" line="157"/>
<source>Wrong username or password.</source>
<translation>Fascher Benutzername oder Passwort.</translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="83"/>
<location filename="../integrationplugintado.cpp" line="160"/>
<source>Connection error</source>
<translation>Verbindungsfehler</translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="92"/>
<source>Client credentials not found, the plug-in version might be outdated.</source>
<translation>Client-Anmeldeinformationen nicht gefunden, die Plug-In-Version ist möglicherweise veraltet.</translation>
</message>
</context>
<context>
<name>Tado</name>

18
tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-en_US.ts
View File

@ -4,20 +4,32 @@
<context>
<name>IntegrationPluginTado</name>
<message>
<location filename="../integrationplugintado.cpp" line="55"/>
<location filename="../integrationplugintado.cpp" line="56"/>
<source>Tado server is not reachable.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="57"/>
<location filename="../integrationplugintado.cpp" line="59"/>
<source>Please enter the login credentials for your Tado account.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="77"/>
<location filename="../integrationplugintado.cpp" line="80"/>
<location filename="../integrationplugintado.cpp" line="157"/>
<source>Wrong username or password.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="83"/>
<location filename="../integrationplugintado.cpp" line="160"/>
<source>Connection error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../integrationplugintado.cpp" line="92"/>
<source>Client credentials not found, the plug-in version might be outdated.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Tado</name>