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

fix(MainDb): store basic chat room participants

Browse source
This commit is contained in:
Ronan Abhamon 2018-05-28 09:27:42 +02:00
parent c7eece9e77
commit 503585ac06
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/chat/chat-room/basic-chat-room-p.h
View file

@ -30,6 +30,7 @@ LINPHONE_BEGIN_NAMESPACE
class BasicChatRoomPrivate : public ChatRoomPrivate {
private:
std::string subject;
std::shared_ptr<Participant> me;
std::list<std::shared_ptr<Participant>> participants;
bool cpimAllowed = false;
bool multipartAllowed = false;

5
src/chat/chat-room/basic-chat-room.cpp
View file

@ -40,6 +40,7 @@ BasicChatRoom::BasicChatRoom (
const ChatRoomId &chatRoomId
) : ChatRoom(p, core, chatRoomId) {
L_D();
d->me = make_shared<Participant>(getLocalAddress());
d->participants.push_back(make_shared<Participant>(getPeerAddress()));
}
@ -102,8 +103,8 @@ shared_ptr<Participant> BasicChatRoom::findParticipant (const IdentityAddress &)
}
shared_ptr<Participant> BasicChatRoom::getMe () const {
lError() << "getMe() is not allowed on a BasicChatRoom";
return nullptr;
L_D();
return d->me;
}
int BasicChatRoom::getParticipantCount () const {

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

@ -362,8 +362,6 @@ long long MainDbPrivate::insertChatRoom (const shared_ptr<AbstractChatRoom> &cha
soci::use(lastUpdateTime), soci::use(capabilities), soci::use(subject), soci::use(flags), soci::use(notifyId);
id = dbSession.getLastInsertId();
if (!chatRoom->canHandleParticipants())
return id;
// Do not add 'me' when creating a server-group-chat-room.
if (chatRoomId.getLocalAddress() != chatRoomId.getPeerAddress()) {