mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-23 22:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More fixes for message tester.

Browse source
This commit is contained in:
Ghislain MARY 2018-01-30 15:53:48 +01:00
parent e4aab72a61
commit 1bcab84da4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/chat/modifier/file-transfer-chat-message-modifier.cpp
View file

@ -976,8 +976,9 @@ int FileTransferChatMessageModifier::downloadFile(const shared_ptr<ChatMessage>
void FileTransferChatMessageModifier::cancelFileTransfer () {
if (httpRequest) {
if (!belle_http_request_is_cancelled(httpRequest)) {
if (chatRoom) {
shared_ptr<Core> core = chatRoom->getCore();
shared_ptr<ChatMessage> message = chatMessage.lock();
if (message) {
shared_ptr<Core> core = message->getCore();
lInfo() << "Canceling file transfer " << (
currentFileContentToTransfer->getFilePath().empty()
? linphone_core_get_file_transfer_server(core->getCCore())

6
tester/message_tester.c
View file

@ -615,6 +615,7 @@ static void transfer_message_upload_cancelled(void) {
BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageNotDelivered,1, int, "%d");
BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,0, int, "%d");
linphone_chat_message_unref(msg);
linphone_core_manager_destroy(pauline);
linphone_core_manager_destroy(marie);
}
@ -2149,6 +2150,9 @@ void _text_message_with_custom_content_type(bool_t with_lime) {
size_t file_size;
char *buf;
linphone_core_add_content_type_support(marie->lc, "image/svg+xml");
linphone_core_add_content_type_support(pauline->lc, "image/svg+xml");
if (with_lime) {
if (enable_lime_for_message_test(marie, pauline) < 0) goto end;
}
@ -2164,8 +2168,6 @@ void _text_message_with_custom_content_type(bool_t with_lime) {
msg = linphone_chat_room_create_message(chat_room, buf);
linphone_chat_message_set_content_type(msg, "image/svg+xml");
linphone_core_add_content_type_support(marie->lc, "image/svg+xml");
linphone_core_add_content_type_support(pauline->lc, "image/svg+xml");
cbs = linphone_chat_message_get_callbacks(msg);
linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
linphone_chat_room_send_chat_message(chat_room, msg);