mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-16 04:27:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Store chatEvent in chatMessage and update the database event when chatMessage's state changes

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-23 17:31:02 +01:00
parent b12304668a
commit 191a9f24ba
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chat/chat-message/chat-message-p.h
View file

@ -30,6 +30,7 @@
#include "content/content.h"
#include "content/file-content.h"
#include "content/file-transfer-content.h"
#include "event-log/conference/conference-chat-message-event.h"
#include "object/object-p.h"
#include "sal/sal.h"
@ -153,6 +154,7 @@ private:
// Do not expose.
std::weak_ptr<ChatRoom> chatRoom;
std::weak_ptr<ConferenceChatMessageEvent> chatEvent;
ChatRoomId chatRoomId;
IdentityAddress fromAddress;
IdentityAddress toAddress;

14
src/chat/chat-message/chat-message.cpp
View file

@ -36,7 +36,6 @@
#include "content/content.h"
#include "core/core.h"
#include "core/core-p.h"
#include "event-log/conference/conference-chat-message-event.h"
#include "logger/logger.h"
#include "chat/notification/imdn.h"
@ -97,6 +96,8 @@ void ChatMessagePrivate::setState (ChatMessage::State s, bool force) {
LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
if (cbs && linphone_chat_message_cbs_get_msg_state_changed(cbs))
linphone_chat_message_cbs_get_msg_state_changed(cbs)(msg, linphone_chat_message_get_state(msg));
store();
}
unsigned int ChatMessagePrivate::getStorageId () const {
@ -580,8 +581,15 @@ void ChatMessagePrivate::send () {
void ChatMessagePrivate::store() {
L_Q();
shared_ptr<ConferenceChatMessageEvent> eventLog = make_shared<ConferenceChatMessageEvent>(time, q->getSharedFromThis());
q->getChatRoom()->getCore()->getPrivate()->mainDb->addEvent(eventLog);
shared_ptr<ConferenceChatMessageEvent> eventLog = chatEvent.lock();
if (eventLog) {
q->getChatRoom()->getCore()->getPrivate()->mainDb->updateEvent(eventLog);
} else {
eventLog = make_shared<ConferenceChatMessageEvent>(time, q->getSharedFromThis());
chatEvent = eventLog;
q->getChatRoom()->getCore()->getPrivate()->mainDb->addEvent(eventLog);
}
}
// -----------------------------------------------------------------------------