Browse Source

fix toxme error handling

fixes a bug in Toxme::deleteAddress returning a QNetworkReply::NetworkError
adds some warning messages
pull/2828/head
sudden6 10 years ago
parent
commit
789eeec777
  1. 10
      src/net/toxme.cpp

10
src/net/toxme.cpp

@ -47,6 +47,10 @@ QByteArray Toxme::makeJsonRequest(QString url, QString json, QNetworkReply::Netw @@ -47,6 +47,10 @@ QByteArray Toxme::makeJsonRequest(QString url, QString json, QNetworkReply::Netw
qApp->processEvents();
}
error = reply->error();
if (error)
qWarning() << "makeJsonRequest: A network error occured:" << error.errorString();
return reply->readAll();
}
@ -70,6 +74,10 @@ QByteArray Toxme::getServerPubkey(QString url, QNetworkReply::NetworkError &erro @@ -70,6 +74,10 @@ QByteArray Toxme::getServerPubkey(QString url, QNetworkReply::NetworkError &erro
qApp->processEvents();
}
error = reply->error();
if (error)
qWarning() << "getServerPubkey: A network error occured:" << error.errorString();
// Extract key
static const QByteArray pattern{"key\":\""};
@ -277,8 +285,6 @@ int Toxme::deleteAddress(QString server, ToxId id) @@ -277,8 +285,6 @@ int Toxme::deleteAddress(QString server, ToxId id)
QString apiUrl = server + "/api";
QNetworkReply::NetworkError error = QNetworkReply::NoError;
QByteArray response = makeJsonRequest(apiUrl, prepareEncryptedJson(pubkeyUrl, 2, payload), error);
if (error != QNetworkReply::NoError)
return error;
return extractError(response);
}

Loading…
Cancel
Save