mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

keep fixing fetch of chat room

Browse source
This commit is contained in:
Benjamin Reis 2017-12-05 11:51:37 +01:00
parent f04c4a40e1
commit b8b82f7fdb
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/chat/chat-room/client-group-chat-room.cpp
View file

@ -99,15 +99,16 @@ RemoteConference(core, me, nullptr) {
ClientGroupChatRoom::ClientGroupChatRoom (
const shared_ptr<Core> &core,
const IdentityAddress &peerAddress,
const ChatRoomId &chatRoomId,
shared_ptr<Participant> &me,
const string &subject,
list<shared_ptr<Participant>> &&participants,
unsigned int lastNotifyId
) : ChatRoom(*new ClientGroupChatRoomPrivate, core, ChatRoomId(peerAddress, me->getAddress())),
) : ChatRoom(*new ClientGroupChatRoomPrivate, core, chatRoomId),
RemoteConference(core, me->getAddress(), nullptr) {
L_D_T(RemoteConference, dConference);
const IdentityAddress &peerAddress = chatRoomId.getPeerAddress();
dConference->focus = make_shared<Participant>(peerAddress);
dConference->conferenceAddress = peerAddress;
dConference->subject = subject;

2
src/chat/chat-room/client-group-chat-room.h
View file

@ -41,7 +41,7 @@ public:
ClientGroupChatRoom (
const std::shared_ptr<Core> &core,
const IdentityAddress &peerAddress,
const ChatRoomId &chatRoomId,
std::shared_ptr<Participant> &me,
const std::string &subject,
std::list<std::shared_ptr<Participant>> &&participants,

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

@ -191,7 +191,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "DELETE FROM chat_message_content WHERE event_id=:eventId", soci::use(eventId);
//TODO: remove file content if exists
//*session << "DELETE FROM chat_message_file_content WHERE chat_message_content_id=:messageContentId", soci::use(messageContentId);
@ -1924,7 +1924,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
}
chatRoom = make_shared<ClientGroupChatRoom>(
core,
chatRoomId.getPeerAddress(),
chatRoomId,
me,
subject,
move(participants),