From 065dbf970ff922a73e7792d9ca1fb00009461a0e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 27 Apr 2018 14:17:47 +0200 Subject: [PATCH] Prevent sent IMDN messages from being notified to the application. --- src/chat/chat-message/imdn-message.h | 1 + src/chat/notification/imdn.cpp | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chat/chat-message/imdn-message.h b/src/chat/chat-message/imdn-message.h index 243b7ae66..28ce11084 100644 --- a/src/chat/chat-message/imdn-message.h +++ b/src/chat/chat-message/imdn-message.h @@ -32,6 +32,7 @@ class ImdnMessagePrivate; class LINPHONE_PUBLIC ImdnMessage : public NotificationMessage { public: friend class ChatRoomPrivate; + friend class Imdn; L_OVERRIDE_SHARED_FROM_THIS(ImdnMessage); diff --git a/src/chat/notification/imdn.cpp b/src/chat/notification/imdn.cpp index 4eb7247b2..7c8269b3d 100644 --- a/src/chat/notification/imdn.cpp +++ b/src/chat/notification/imdn.cpp @@ -19,8 +19,7 @@ #include -#include "chat/chat-message/chat-message-p.h" -#include "chat/chat-message/imdn-message.h" +#include "chat/chat-message/imdn-message-p.h" #include "chat/chat-room/chat-room-p.h" #include "core/core-p.h" #include "logger/logger.h" @@ -205,7 +204,7 @@ void Imdn::send () { auto imdnMessage = chatRoom->getPrivate()->createImdnMessage(deliveredMessages, displayedMessages); sentImdnMessages.push_back(imdnMessage); if (networkReachable) - imdnMessage->send(); + imdnMessage->getPrivate()->send(); deliveredMessages.clear(); displayedMessages.clear(); } @@ -213,7 +212,7 @@ void Imdn::send () { auto imdnMessage = chatRoom->getPrivate()->createImdnMessage(nonDeliveredMessages); sentImdnMessages.push_back(imdnMessage); if (networkReachable) - imdnMessage->send(); + imdnMessage->getPrivate()->send(); nonDeliveredMessages.clear(); } }