witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Fix last notify id in DB when inserting a client group chat room.

Browse source
This commit is contained in:
Ghislain MARY 2018-04-10 11:57:21 +02:00 • committed by Benjamin Reis
parent 016927324b
commit f2910f7d91
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/chat/chat-room/abstract-chat-room.h
View file

@ -41,6 +41,7 @@ class LINPHONE_PUBLIC AbstractChatRoom : public Object, public CoreAccessor, pub
friend class Core;
friend class CorePrivate;
friend class MainDb;
friend class MainDbPrivate;
friend class ProxyChatRoomPrivate;
public:

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

@ -38,6 +38,8 @@ public:
void setCallSessionListener (CallSessionListener *listener);
void setChatRoomListener (ChatRoomListener *listener) { chatRoomListener = listener; }
unsigned int getLastNotifyId () const;
// ChatRoomListener
void onChatRoomInsertRequested (const std::shared_ptr<AbstractChatRoom> &chatRoom) override;
void onChatRoomInsertInDatabaseRequested (const std::shared_ptr<AbstractChatRoom> &chatRoom) override;

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

@ -103,6 +103,12 @@ void ClientGroupChatRoomPrivate::setCallSessionListener (CallSessionListener *li
}
}
unsigned int ClientGroupChatRoomPrivate::getLastNotifyId () const {
L_Q_T(RemoteConference, qConference);
return qConference->getPrivate()->eventHandler->getLastNotify();
}
// -----------------------------------------------------------------------------
void ClientGroupChatRoomPrivate::onChatRoomInsertRequested (const shared_ptr<AbstractChatRoom> &chatRoom) {

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

@ -24,7 +24,7 @@
#include "chat/chat-message/chat-message-p.h"
#include "chat/chat-room/chat-room-p.h"
#include "chat/chat-room/client-group-chat-room.h"
#include "chat/chat-room/client-group-chat-room-p.h"
#include "chat/chat-room/server-group-chat-room.h"
#include "conference/participant-device.h"
#include "conference/participant-p.h"
@ -333,13 +333,23 @@ long long MainDbPrivate::insertChatRoom (const shared_ptr<AbstractChatRoom> &cha
// Remove capabilities like `Proxy`.
const int &capabilities = chatRoom->getCapabilities() & ~ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::Proxy);
unsigned int lastNotifyId = 0;
if (!linphone_core_conference_server_enabled(chatRoom->getCore()->getCCore())
&& (chatRoom->getCapabilities() & ChatRoom::Capabilities::Conference)
)
lastNotifyId = static_cast<ClientGroupChatRoomPrivate *>(chatRoom->getPrivate())->getLastNotifyId();
const string &subject = chatRoom->getSubject();
const int &flags = chatRoom->hasBeenLeft();
*dbSession.getBackendSession() << "INSERT INTO chat_room ("
" peer_sip_address_id, local_sip_address_id, creation_time, last_update_time, capabilities, subject, flags"
") VALUES (:peerSipAddressId, :localSipAddressId, :creationTime, :lastUpdateTime, :capabilities, :subject, :flags)",
soci::use(peerSipAddressId), soci::use(localSipAddressId), soci::use(creationTime), soci::use(lastUpdateTime),
soci::use(capabilities), soci::use(subject), soci::use(flags);
" peer_sip_address_id, local_sip_address_id, creation_time,"
" last_update_time, capabilities, subject, flags, last_notify_id"
") VALUES ("
" :peerSipAddressId, :localSipAddressId, :creationTime,"
" :lastUpdateTime, :capabilities, :subject, :flags, :lastNotifyId"
")",
soci::use(peerSipAddressId), soci::use(localSipAddressId), soci::use(creationTime),
soci::use(lastUpdateTime), soci::use(capabilities), soci::use(subject), soci::use(flags), soci::use(lastNotifyId);
id = dbSession.getLastInsertId();
if (!chatRoom->canHandleParticipants())