Merge branch 'chat' into chat

This commit is contained in:
Strider
2020-05-09 21:57:03 +02:00
committed by GitHub
3 changed files with 7 additions and 7 deletions

View File

@@ -939,7 +939,7 @@ void Controller::refreshTransactions() {
QString type;
QString cid;
int position;
// int position;
QString requestZaddr1;
QString requestZaddr;
@@ -984,7 +984,7 @@ void Controller::refreshTransactions() {
}else{ contact = "";}
position = it["position"].get<json::number_integer_t>();
// position = it["position"].get<json::number_integer_t>();
ChatItem item = ChatItem(
datetime,
@@ -999,7 +999,7 @@ void Controller::refreshTransactions() {
);
//DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
qDebug() << "Position der Message : " << position;
}
}