From 7d6fc054591a0163e00e2adbdadeea4e06ec6f34 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Wed, 6 Dec 2017 13:34:58 +0100 Subject: [PATCH] setImdnMessageId is now private --- src/c-wrapper/api/c-chat-message.cpp | 2 +- src/chat/chat-message/chat-message-p.h | 4 +++- src/chat/chat-message/chat-message.cpp | 15 +++++++-------- src/chat/chat-message/chat-message.h | 1 - src/chat/chat-room/chat-room.cpp | 2 +- src/chat/modifier/cpim-chat-message-modifier.cpp | 4 ++-- src/db/main-db.cpp | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp index 7826ced15..96c95914e 100644 --- a/src/c-wrapper/api/c-chat-message.cpp +++ b/src/c-wrapper/api/c-chat-message.cpp @@ -151,7 +151,7 @@ const char* linphone_chat_message_get_message_id(const LinphoneChatMessage *msg) } void linphone_chat_message_set_message_id(LinphoneChatMessage *msg, char *id) { - L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setImdnMessageId(L_C_TO_STRING(id)); + L_GET_PRIVATE_FROM_C_OBJECT(msg)->setImdnMessageId(L_C_TO_STRING(id)); } bool_t linphone_chat_message_is_read(LinphoneChatMessage *msg) { diff --git a/src/chat/chat-message/chat-message-p.h b/src/chat/chat-message/chat-message-p.h index 2665afe0a..c805eb935 100644 --- a/src/chat/chat-message/chat-message-p.h +++ b/src/chat/chat-message/chat-message-p.h @@ -65,6 +65,8 @@ public: void setIsReadOnly(bool readOnly); + void setImdnMessageId (const std::string &imdnMessageId); + inline void forceFromAddress (const IdentityAddress &fromAddress) { this->fromAddress = fromAddress; } @@ -127,7 +129,7 @@ public: private: // TODO: Clean attributes. time_t time = ::ms_time(0); // TODO: Change me in all files. - std::string id; + std::string imdnId; std::string rttMessage; bool isSecured = false; bool isReadOnly = false; diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp index c75adc429..958703c7c 100644 --- a/src/chat/chat-message/chat-message.cpp +++ b/src/chat/chat-message/chat-message.cpp @@ -320,7 +320,7 @@ void ChatMessagePrivate::sendImdn (Imdn::Type imdnType, LinphoneReason reason) { Content *content = new Content(); content->setContentType("message/imdn+xml"); - content->setBody(Imdn::createXml(id, time, imdnType, reason)); + content->setBody(Imdn::createXml(imdnId, time, imdnType, reason)); msg->addContent(*content); msg->getPrivate()->send(); @@ -416,7 +416,7 @@ LinphoneReason ChatMessagePrivate::receive () { setDirection(ChatMessage::Direction::Outgoing); // Check if this is a duplicate message. - if (chatRoom && chatRoom->findMessageWithDirection(q->getImdnMessageId(), direction)) + if (chatRoom && chatRoom->findMessageWithDirection(imdnId, direction)) return core->getCCore()->chat_deny_code; if (errorCode > 0) { @@ -558,8 +558,8 @@ void ChatMessagePrivate::send () { } } - if (q->getImdnMessageId().empty()) - q->setImdnMessageId(op->get_call_id()); /* must be known at that time */ + if (imdnId.empty()) + setImdnMessageId(op->get_call_id()); /* must be known at that time */ //store(); // Store will be done right below in the setState(InProgress) @@ -692,12 +692,11 @@ ChatMessage::State ChatMessage::getState () const { const string &ChatMessage::getImdnMessageId () const { L_D(); - return d->id; + return d->imdnId; } -void ChatMessage::setImdnMessageId (const string &id) { - L_D(); - d->id = id; +void ChatMessagePrivate::setImdnMessageId (const string &id) { + imdnId = id; } bool ChatMessage::isRead () const { diff --git a/src/chat/chat-message/chat-message.h b/src/chat/chat-message/chat-message.h index a582dcee8..8cb4a09d8 100644 --- a/src/chat/chat-message/chat-message.h +++ b/src/chat/chat-message/chat-message.h @@ -64,7 +64,6 @@ public: void updateState (State state); void sendDeliveryNotification (LinphoneReason reason); void sendDisplayNotification (); - void setImdnMessageId (const std::string &imdnMessageId); void setIsSecured (bool isSecured); // ----- TODO: Remove me. diff --git a/src/chat/chat-room/chat-room.cpp b/src/chat/chat-room/chat-room.cpp index 25f7500d2..194c02626 100644 --- a/src/chat/chat-room/chat-room.cpp +++ b/src/chat/chat-room/chat-room.cpp @@ -147,7 +147,7 @@ LinphoneReason ChatRoomPrivate::messageReceived (SalOp *op, const SalMessage *sa msg->setInternalContent(content); msg->getPrivate()->setTime(salMsg->time); - msg->setImdnMessageId(op->get_call_id()); + msg->getPrivate()->setImdnMessageId(op->get_call_id()); const SalCustomHeader *ch = op->get_recv_custom_header(); if (ch) diff --git a/src/chat/modifier/cpim-chat-message-modifier.cpp b/src/chat/modifier/cpim-chat-message-modifier.cpp index 7d866b4a3..314906e58 100644 --- a/src/chat/modifier/cpim-chat-message-modifier.cpp +++ b/src/chat/modifier/cpim-chat-message-modifier.cpp @@ -50,7 +50,7 @@ ChatMessageModifier::Result CpimChatMessageModifier::encode (const shared_ptrsetImdnMessageId(token); + message->getPrivate()->setImdnMessageId(token); const Content *content; if (!message->getInternalContent().isEmpty()) { @@ -134,7 +134,7 @@ ChatMessageModifier::Result CpimChatMessageModifier::decode (const shared_ptrgetName() == "To") cpimToAddress = Address(header->getValue()); else if (header->getName() == "Message-ID") - message->setImdnMessageId(header->getValue()); + message->getPrivate()->setImdnMessageId(header->getValue()); } } diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index 26f1b5d13..c9f211975 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -520,7 +520,6 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), static_cast(direction) )); chatMessage->setIsSecured(static_cast(isSecured)); - chatMessage->setImdnMessageId(imdnMessageId); ChatMessagePrivate *dChatMessage = chatMessage->getPrivate(); dChatMessage->setState(static_cast(state), true); @@ -528,6 +527,7 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), dChatMessage->forceToAddress(IdentityAddress(toSipAddress)); dChatMessage->setTime(Utils::getTmAsTimeT(messageTime)); + dChatMessage->setImdnMessageId(imdnMessageId); } // 2 - Fetch contents.