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

feat(MainDB): supports chat messages store

Browse source
This commit is contained in:
Ronan Abhamon 2017-10-18 09:35:43 +02:00
parent 2a9d4afef2
commit 88fbd50b76
7 changed files with 52 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/chat/chat-message/chat-message.cpp
View file

@ -1327,6 +1327,14 @@ void ChatMessage::setToAddress(Address to) {
d->to = to;
}
const Address &ChatMessage::getLocalAddress () const {
return getDirection() == Direction::Incoming ? getToAddress() : getFromAddress();
}
const Address &ChatMessage::getRemoteAddress () const {
return getDirection() != Direction::Incoming ? getToAddress() : getFromAddress();
}
const string& ChatMessage::getFileTransferFilepath() const {
L_D();
return d->fileTransferFilePath;

2
src/chat/chat-message/chat-message.h
View file

@ -85,6 +85,8 @@ public:
const Address &getFromAddress () const;
const Address &getToAddress () const;
const Address &getLocalAddress () const;
const Address &getRemoteAddress () const;
const LinphoneErrorInfo *getErrorInfo () const;

2
src/chat/chat-room/basic-chat-room.h
View file

@ -33,7 +33,7 @@ public:
BasicChatRoom (LinphoneCore *core, const Address &peerAddress);
virtual ~BasicChatRoom () = default;
int getCapabilities () const override;
CapabilitiesMask getCapabilities () const override;
/* ConferenceInterface. */
void addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override;

4
src/chat/chat-room/chat-room.h
View file

@ -39,10 +39,12 @@ public:
L_DECLARE_ENUM(Capabilities, L_ENUM_VALUES_CHAT_ROOM_CAPABILITIES);
L_DECLARE_ENUM(State, L_ENUM_VALUES_CHAT_ROOM_STATE);
typedef int CapabilitiesMask;
ChatRoom (LinphoneCore *core);
virtual ~ChatRoom () = default;
virtual int getCapabilities () const = 0;
virtual CapabilitiesMask getCapabilities () const = 0;
void compose ();
std::shared_ptr<ChatMessage> createFileTransferMessage (const LinphoneContent *initialContent);

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

@ -34,7 +34,7 @@ public:
ClientGroupChatRoom (LinphoneCore *core, const Address &me, const std::string &uri, const std::string &subject);
virtual ~ClientGroupChatRoom () = default;
int getCapabilities () const override;
CapabilitiesMask getCapabilities () const override;
/* ConferenceInterface */
void addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override;

2
src/chat/chat-room/real-time-text-chat-room.h
View file

@ -33,7 +33,7 @@ public:
RealTimeTextChatRoom (LinphoneCore *core, const Address &peerAddress);
virtual ~RealTimeTextChatRoom () = default;
int getCapabilities () const override;
CapabilitiesMask getCapabilities () const override;
uint32_t getChar () const;
LinphoneCall *getCall () const;

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

@ -247,8 +247,37 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
}
long MainDbPrivate::insertMessageEvent (const EventLog &eventLog) {
// TODO.
return 0;
shared_ptr<ChatMessage> chatMessage = static_cast<const ChatMessageEvent &>(eventLog).getChatMessage();
shared_ptr<ChatRoom> chatRoom = chatMessage->getChatRoom();
if (!chatRoom) {
lError() << "Unable to get a valid chat room. It was removed from database.";
return -1;
}
tm eventTime = Utils::getLongAsTm(static_cast<long>(eventLog.getTime()));
struct MessageEventReferences references;
references.eventId = insertEvent(EventLog::Type::ChatMessage, eventTime);
references.localSipAddressId = insertSipAddress(chatMessage->getLocalAddress().asString());
references.remoteSipAddressId = insertSipAddress(chatMessage->getRemoteAddress().asString());
references.chatRoomId = insertChatRoom(
references.remoteSipAddressId,
chatRoom->getCapabilities(),
eventTime
);
insertChatRoomParticipant(references.chatRoomId, references.remoteSipAddressId, false);
long eventId = insertMessageEvent (
references,
static_cast<int>(chatMessage->getState()),
static_cast<int>(chatMessage->getDirection()),
chatMessage->getImdnMessageId(),
chatMessage->isSecured(),
chatMessage->getContents()
);
return eventId;
}
long MainDbPrivate::insertConferenceEvent (const EventLog &eventLog) {
@ -260,6 +289,7 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_event (event_id, chat_room_id)"
" VALUES (:eventId, :chatRoomId)", soci::use(eventId), soci::use(chatRoomId);
return eventId;
}
@ -271,6 +301,7 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
" VALUES (:eventId, :notifyId)", soci::use(eventId), soci::use(
static_cast<const ConferenceNotifiedEvent &>(eventLog).getNotifyId()
);
return eventId;
}
@ -283,6 +314,7 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_participant_event (event_id, participant_address_id)"
" VALUES (:eventId, :participantAddressId)", soci::use(eventId), soci::use(participantAddressId);
return eventId;
}
@ -295,6 +327,7 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
soci::session *session = dbSession.getBackendSession<soci::session>();
*session << "INSERT INTO conference_participant_device_event (event_id, gruu_address_id)"
" VALUES (:eventId, :gruuAddressId)", soci::use(eventId), soci::use(gruuAddressId);
return eventId;
}
@ -306,6 +339,7 @@ MainDb::MainDb () : AbstractDb(*new MainDbPrivate) {}
" VALUES (:eventId, :subject)", soci::use(eventId), soci::use(
static_cast<const ConferenceSubjectEvent &>(eventLog).getSubject()
);
return eventId;
}