Commit 31c00aa3 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Fixed issue with file + text message

parent 95ab4ff5
...@@ -767,7 +767,7 @@ void ChatMessagePrivate::processResponseFromPostFile (const belle_http_response_ ...@@ -767,7 +767,7 @@ void ChatMessagePrivate::processResponseFromPostFile (const belle_http_response_
Content fileTransferContent; Content fileTransferContent;
fileTransferContent.setContentType(ContentType::FileTransfer); fileTransferContent.setContentType(ContentType::FileTransfer);
fileTransferContent.setBody(getText()); fileTransferContent.setBody(internalContent.getBodyAsString());
q->addContent(fileTransferContent); q->addContent(fileTransferContent);
q->updateState(ChatMessage::State::FileTransferDone); q->updateState(ChatMessage::State::FileTransferDone);
......
...@@ -458,11 +458,6 @@ void ChatRoom::compose () { ...@@ -458,11 +458,6 @@ void ChatRoom::compose () {
shared_ptr<ChatMessage> ChatRoom::createFileTransferMessage (const LinphoneContent *initialContent) { shared_ptr<ChatMessage> ChatRoom::createFileTransferMessage (const LinphoneContent *initialContent) {
shared_ptr<ChatMessage> chatMessage = createMessage(); shared_ptr<ChatMessage> 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()->setDirection(ChatMessage::Direction::Outgoing);
chatMessage->getPrivate()->setFileTransferInformation(linphone_content_copy(initialContent)); chatMessage->getPrivate()->setFileTransferInformation(linphone_content_copy(initialContent));
return chatMessage; return chatMessage;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment