From 55b780d34f5167741eb33600d434bc98763b64cc Mon Sep 17 00:00:00 2001
From: ondra <fisa.fischer@gmail.com>
Date: Fri, 18 Dec 2020 09:45:13 +0100
Subject: [PATCH] Little fixes and changes

---
 src/colnod/colnodapi.cpp   | 1 -
 src/colnod/databaseapi.cpp | 4 +---
 src/colnod/syncmanager.cpp | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp
index a0fcd07..7e8ec63 100644
--- a/src/colnod/colnodapi.cpp
+++ b/src/colnod/colnodapi.cpp
@@ -415,7 +415,6 @@ bool ColnodAPI::updateAuthToken() {
             emit authTokenUpdated(false);;
             return ;
         }
-        qDebug(colnod) << "Auth token updated.";
         emit authTokenUpdated(true);
     });
 }
diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp
index e42bb86..d5f617a 100644
--- a/src/colnod/databaseapi.cpp
+++ b/src/colnod/databaseapi.cpp
@@ -36,7 +36,7 @@ std::shared_ptr<Data> DatabaseAPI::downloadData()
 {
     auto updatedQuery = mDbMan->createQuery();
     auto deletedQuery = mDbMan->createQuery();
-    if (!executeQuery(updatedQuery, "SELECT * FROM colnod_token WHERE last_modified > last_update AND deleted = false")) {
+    if (!executeQuery(updatedQuery, "SELECT * FROM colnod_token WHERE (last_modified > last_update OR last_update IS NULL) AND deleted = false ")) {
         qWarning(database) << "ERROR during geting new/updated tokens from db.";
         return nullptr;
     }
@@ -238,7 +238,6 @@ bool DatabaseAPI::deleteItems(const QList<QString> &ids, const QString &tableNam
 {
     auto query = mDbMan->createQuery();
     QString nowString = QDateTime::fromMSecsSinceEpoch(getLastSync()).toString("yyyy-MM-dd hh:mm:ss");
-    nowString = "'" + nowString + "'";
     if (tableName == "colnod_subject") {
         for (const auto &id : ids) {
             query.prepare("DELETE FROM colnod_subject_attribute WHERE subject_id = :id");
@@ -254,7 +253,6 @@ bool DatabaseAPI::deleteItems(const QList<QString> &ids, const QString &tableNam
 
     for (const auto &id : ids) {
         query.prepare(QString("UPDATE %1 SET deleted = true, last_update = :now, last_modified = :now WHERE id = :id").arg(tableName));
-//        QString tempId = "'" + id + "'";
         query.bindValue(":id", id);
         query.bindValue(":now", nowString);
         if (!executeQuery(query)) {
diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp
index 17eb453..1b71153 100644
--- a/src/colnod/syncmanager.cpp
+++ b/src/colnod/syncmanager.cpp
@@ -91,7 +91,7 @@ bool SyncManager::startSynchronization()
                     return;
                 }
                 Timestamp time;
-                time.setTimestamp(syncBegin);
+                time.setTimestamp(syncBegin - 75 * 1000);
 
                 auto tokensRequest = colnod->getTokensUpdated(time);
 
@@ -228,7 +228,7 @@ void SyncManager::initNewToken(const std::shared_ptr<Token>& token)
     Q_ASSERT(database);
     Q_ASSERT(token);
     qint16 num = database->getNumOfTokensOfSubject(token->subjectId());
-    token->setName(database->getSubjectNameByTokenId(token->id()) + "_mobile_" + QString::number(num + 1));
+    token->setName(database->getSubjectNameByTokenId(token->id()) + "-" + QString::number(num + 1));
     token->setDescription("mobile");
     token->setTokenData(token->tokenData().toUpper());