From d7f31689373b67000c9692c8db29b92a2d61e4eb Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 9 Nov 2017 17:27:43 +0100 Subject: [PATCH] fix(MainDb): fetch conference chat rooms --- src/db/main-db.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index 0a527dee5..23e76488b 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -28,6 +28,7 @@ #include "chat/chat-message/chat-message-p.h" #include "chat/chat-room/chat-room.h" +#include "chat/chat-room/client-group-chat-room.h" #include "conference/participant.h" #include "content/content-type.h" #include "content/content.h" @@ -1275,10 +1276,9 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), soci::rowset rows = (session->prepare << query); for (const auto &row : rows) { - string sipAddress = row.get(0); - shared_ptr chatRoom = core->findChatRoom(Address(sipAddress)); + Address peerAddress = Address(row.get(0)); + shared_ptr chatRoom = core->findChatRoom(peerAddress); if (chatRoom) { - lInfo() << "Don't fetch chat room from database: `" << sipAddress << "`, it already exists."; chatRooms.push_back(chatRoom); continue; } @@ -1292,16 +1292,20 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), // TODO: Use me. (void)creationDate; (void)lastUpdateDate; - (void)subject; (void)lastNotifyId; if (capabilities & static_cast(ChatRoom::Capabilities::Basic)) { chatRoom = core->getPrivate()->createBasicChatRoom( - Address(sipAddress), + peerAddress, capabilities & static_cast(ChatRoom::Capabilities::RealTimeText) ); } else if (capabilities & static_cast(ChatRoom::Capabilities::Conference)) { - // TODO: Set sip address and participants. + chatRoom = make_shared( + getCore(), + Address("sip:titi@sip.linphone.org"), // TODO: Fix me!!! + peerAddress.asStringUriOnly(), + subject + ); } if (!chatRoom)