mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-30 09:49:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(BasicChatRoom): do not notify chat room state when it is fetched from database

Browse source
This commit is contained in:
Ronan Abhamon 2017-12-07 17:25:35 +01:00
parent 146042ac6d
commit a531204489
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/chat/chat-room/chat-room-p.h
View file

@ -69,7 +69,6 @@ public:
std::shared_ptr<ChatMessage> createChatMessage (ChatMessage::Direction direction);
LinphoneCall *call = nullptr;
ChatRoom::State state = ChatRoom::State::None;
bool isComposing = false;
std::list<Address> remoteIsComposing;
std::list<std::shared_ptr<EventLog>> transientEvents;
@ -82,6 +81,8 @@ public:
// TODO: Check all fields before this point.
ChatRoom::State state = ChatRoom::State::None;
public:
virtual void onChatMessageReceived (const std::shared_ptr<ChatMessage> &chatMessage) = 0;

9
src/core/core-chat-room.cpp
View file

@ -61,7 +61,7 @@ static IdentityAddress getDefaultLocalAddress (const shared_ptr<Core> &core, con
// -----------------------------------------------------------------------------
shared_ptr<ChatRoom> CorePrivate::createBasicChatRoom (const ChatRoomId &chatRoomId, bool isRtt) {
shared_ptr<ChatRoom> CorePrivate::createBasicChatRoom (const ChatRoomId &chatRoomId, bool isRtt, bool notifyCreation) {
L_Q();
shared_ptr<ChatRoom> chatRoom;
@ -73,8 +73,11 @@ shared_ptr<ChatRoom> CorePrivate::createBasicChatRoom (const ChatRoomId &chatRoo
ChatRoomPrivate *dChatRoom = chatRoom->getPrivate();
dChatRoom->setState(ChatRoom::State::Instantiated);
dChatRoom->setState(ChatRoom::State::Created);
if (notifyCreation) {
dChatRoom->setState(ChatRoom::State::Instantiated);
dChatRoom->setState(ChatRoom::State::Created);
} else
dChatRoom->state = ChatRoom::State::Created;
return chatRoom;
}

2
src/core/core-p.h
View file

@ -54,7 +54,7 @@ public:
void insertChatRoom (const std::shared_ptr<ChatRoom> &chatRoom);
void insertChatRoomWithDb (const std::shared_ptr<ChatRoom> &chatRoom);
std::shared_ptr<ChatRoom> createBasicChatRoom (const ChatRoomId &chatRoomId, bool isRtt);
std::shared_ptr<ChatRoom> createBasicChatRoom (const ChatRoomId &chatRoomId, bool isRtt, bool notifyCreation = true);
std::unique_ptr<MainDb> mainDb;