michalks/colnod-connector
1
0
Fork 0
forked from ondra/colnod-connector
Code Issues Pull Requests Projects Releases Wiki Activity

trying to solve unittest crash ( adding more checks )

Browse Source 
fixed cppcheck warning
This commit is contained in:
Filip Bucek 2019-12-02 15:07:24 +01:00
parent 79cebf9130
commit 443a76e50f
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/colnod/colnodapi.cpp
View File

@ -26,14 +26,26 @@ void ColnodAPI::downloadData(const Timestamp &time)
auto login = requestLogin();
connect(login.get(), &serversdk::Request::finished, this, [=](){
// Get login token
if (!checkRequest(login)) {
if (login->status() != 200) {
emit downloadDataFinished(nullptr);
return;
}
AuthToken token;
token.fromJson(login->responseData());
auto responseData = login->responseData();
if (responseData.isEmpty()) {
qCWarning(colnod) << "empty response data when logging in";
emit downloadDataFinished(nullptr);
return;
}
token.fromJson(responseData);
authToken = token.id();
if (authToken.isEmpty()) {
qCCritical(colnod) << "Token uuid is empty";
emit downloadDataFinished(nullptr);
return;
}
auto data = std::make_shared<Data>();

3
src/colnod/data.h
View File

@ -43,12 +43,11 @@ struct PreparedData
{
public:
PreparedData() = default;
PreparedData(std::shared_ptr<Data> database, std::shared_ptr<Data> colnod)
PreparedData(const std::shared_ptr<Data> &database, const std::shared_ptr<Data> &colnod)
:databaseData(std::move(database)), colnodData(std::move(colnod))
{
}
// TODO: make unique_ptr ( neeed because of ColnodAPI )
std::shared_ptr<Data> databaseData;
std::shared_ptr<Data> colnodData;