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

make sure imdm are still passed to the application if deliver_imdn setting is set to 1

Browse source
This commit is contained in:
Jehan Monnier 2018-02-22 17:34:07 +01:00
parent 4b5e950d01
commit 6da095454c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,15 +447,13 @@ static void forceUtf8Content (Content &content) {
void ChatMessagePrivate::notifyReceiving () {
L_Q();
if ((getContentType() == ContentType::Imdn) || (getContentType() == ContentType::ImIsComposing))
return;
LinphoneChatRoom *chatRoom = L_GET_C_BACK_PTR(q->getChatRoom());
linphone_chat_room_notify_chat_message_should_be_stored(chatRoom, L_GET_C_BACK_PTR(q->getSharedFromThis()));
if (toBeStored)
storeInDb();
if ((getContentType() != ContentType::Imdn) && (getContentType() != ContentType::ImIsComposing)) {
linphone_chat_room_notify_chat_message_should_be_stored(chatRoom, L_GET_C_BACK_PTR(q->getSharedFromThis()));
if (toBeStored)
storeInDb();
}
shared_ptr<ConferenceChatMessageEvent> event = make_shared<ConferenceChatMessageEvent>(
::time(nullptr), q->getSharedFromThis()
);
@ -463,7 +461,9 @@ void ChatMessagePrivate::notifyReceiving () {
// Legacy
q->getChatRoom()->getPrivate()->notifyChatMessageReceived(q->getSharedFromThis());
q->sendDeliveryNotification(LinphoneReasonNone);
if ((getContentType() != ContentType::Imdn) && (getContentType() != ContentType::ImIsComposing)) {
q->sendDeliveryNotification(LinphoneReasonNone);
}
}
LinphoneReason ChatMessagePrivate::receive () {