mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-06 21:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(MainDb): update correctly last update time on chat room in import case

Browse source
This commit is contained in:
Ronan Abhamon 2017-12-07 14:07:04 +01:00
parent a1dc06d352
commit 65d98ad4d2
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/db/main-db-p.h
View file

@ -53,7 +53,7 @@ private:
long long insertSipAddress (const std::string &sipAddress);
void insertContent (long long messageEventId, const Content &content);
long long insertContentType (const std::string &contentType);
long long insertBasicChatRoom (
long long insertOrUpdateBasicChatRoom (
long long peerSipAddressId,
long long localSipAddressId,
const tm &creationTime

9
src/db/main-db.cpp
View file

@ -190,7 +190,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
return q->getLastInsertId();
}
long long MainDbPrivate::insertBasicChatRoom (
long long MainDbPrivate::insertOrUpdateBasicChatRoom (
long long peerSipAddressId,
long long localSipAddressId,
const tm &creationTime
@ -200,8 +200,11 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
soci::session *session = dbSession.getBackendSession<soci::session>();
long long id = selectChatRoomId(peerSipAddressId, localSipAddressId);
if (id >= 0)
if (id >= 0) {
*session << "UPDATE chat_room SET last_update_time = :lastUpdateTime WHERE id = :id",
soci::use(creationTime), soci::use(id);
return id;
}
static const int capabilities = static_cast<int>(ChatRoom::Capabilities::Basic);
lInfo() << "Insert new chat room in database: (peer=" << peerSipAddressId <<
@ -2244,7 +2247,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
const long long &eventId = getLastInsertId();
const long long &localSipAddressId = d->insertSipAddress(message.get<string>(LEGACY_MESSAGE_COL_LOCAL_ADDRESS));
const long long &remoteSipAddressId = d->insertSipAddress(message.get<string>(LEGACY_MESSAGE_COL_REMOTE_ADDRESS));
const long long &chatRoomId = d->insertBasicChatRoom(
const long long &chatRoomId = d->insertOrUpdateBasicChatRoom(
remoteSipAddressId,
localSipAddressId,
creationTime