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

Fixed issues related to chat file transfer

Browse source
This commit is contained in:
Sylvain Berfini 2017-09-28 16:20:37 +02:00
parent 77dbc1b9ba
commit 5bf3920571
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -511,7 +511,7 @@ void ChatMessagePrivate::onRecvEnd(belle_sip_user_body_handler_t *bh) {
}
bool ChatMessagePrivate::isFileTransferInProgressAndValid() {
return (chatRoom && chatRoom->getCore() && httpRequest && !!belle_http_request_is_cancelled(httpRequest));
return (chatRoom && chatRoom->getCore() && httpRequest && !belle_http_request_is_cancelled(httpRequest));
}
static void _chat_message_process_response_from_post_file(void *data, const belle_http_response_event_t *event) {
@ -835,7 +835,7 @@ int ChatMessagePrivate::startHttpTransfer(std::string url, std::string action, b
belle_sip_object_ref(httpRequest);
// give msg to listener to be able to start the actual file upload when server answer a 204 No content
httpListener = belle_http_request_listener_create_from_callbacks(cbs, NULL);
httpListener = belle_http_request_listener_create_from_callbacks(cbs, this);
belle_http_provider_send_request(chatRoom->getCore()->http_provider, httpRequest, httpListener);
return 0;
error:

1
src/chat/chat-room.cpp
View file

@ -596,7 +596,6 @@ LinphoneChatMessage *ChatRoom::createFileTransferMessage (const LinphoneContent
shared_ptr<ChatMessage> chatMessage = make_shared<ChatMessage>(static_pointer_cast<ChatRoom>(shared_from_this()));
chatMessage->getPrivate()->setTime(ms_time(0));
chatMessage->getPrivate()->setContentType("text/plain");
chatMessage->getPrivate()->setDirection(ChatMessage::Direction::Outgoing);
chatMessage->getPrivate()->setFileTransferInformation(linphone_content_copy(initialContent));
chatMessage->setToAddress(make_shared<Address>(d->peerAddress.asString().c_str()));