From 31c00aa3df13c9fe4b4e4d84ae22ee12455d2335 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 7 Nov 2017 13:17:55 +0100 Subject: [PATCH] Fixed issue with file + text message --- src/chat/chat-message/chat-message.cpp | 2 +- src/chat/chat-room/chat-room.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp index 7a2c37352..068821313 100644 --- a/src/chat/chat-message/chat-message.cpp +++ b/src/chat/chat-message/chat-message.cpp @@ -767,7 +767,7 @@ void ChatMessagePrivate::processResponseFromPostFile (const belle_http_response_ Content fileTransferContent; fileTransferContent.setContentType(ContentType::FileTransfer); - fileTransferContent.setBody(getText()); + fileTransferContent.setBody(internalContent.getBodyAsString()); q->addContent(fileTransferContent); q->updateState(ChatMessage::State::FileTransferDone); diff --git a/src/chat/chat-room/chat-room.cpp b/src/chat/chat-room/chat-room.cpp index 3d085d61d..cfba88fd7 100644 --- a/src/chat/chat-room/chat-room.cpp +++ b/src/chat/chat-room/chat-room.cpp @@ -458,11 +458,6 @@ void ChatRoom::compose () { shared_ptr ChatRoom::createFileTransferMessage (const LinphoneContent *initialContent) { shared_ptr chatMessage = createMessage(); - /*Content content; - content.setContentType(ContentType::FileTransfer); - content.setBody(linphone_content_get_string_buffer(initialContent)); - chatMessage->addContent(content);*/ - chatMessage->getPrivate()->setDirection(ChatMessage::Direction::Outgoing); chatMessage->getPrivate()->setFileTransferInformation(linphone_content_copy(initialContent)); return chatMessage;