From 2e883b02a31f2d92b6b4c4e5048cf8ca6c36e84e Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 11 Feb 2022 14:35:46 +0100 Subject: [PATCH] fix send multiparts message in basic chatroom --- Classes/ChatConversationView.m | 4 ++-- Classes/Utils/FileTransferDelegate.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index e1c1530d2..f2ad8bcdb 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -782,10 +782,10 @@ static UICompositeViewDescription *compositeDescription = nil; } else { int i = 0; for (i = 0; i < [_fileContext count]-1; ++i) { - [self startUploadData:[_fileContext.datasArray objectAtIndex:i] withType:[_fileContext.typesArray objectAtIndex:i] withName:[_fileContext.namesArray objectAtIndex:i] andMessage:NULL rootMessage:rootMessage]; + [self startUploadData:[_fileContext.datasArray objectAtIndex:i] withType:[_fileContext.typesArray objectAtIndex:i] withName:[_fileContext.namesArray objectAtIndex:i] andMessage:NULL rootMessage:NULL]; } if (isOneToOne) { - [self startUploadData:[_fileContext.datasArray objectAtIndex:i] withType:[_fileContext.typesArray objectAtIndex:i] withName:[_fileContext.namesArray objectAtIndex:i] andMessage:NULL rootMessage:rootMessage]; + [self startUploadData:[_fileContext.datasArray objectAtIndex:i] withType:[_fileContext.typesArray objectAtIndex:i] withName:[_fileContext.namesArray objectAtIndex:i] andMessage:NULL rootMessage:NULL]; if (![[self.messageField text] isEqualToString:@""]) { [self sendMessage:[_messageField text] withExterlBodyUrl:nil rootMessage:rootMessage]; } diff --git a/Classes/Utils/FileTransferDelegate.m b/Classes/Utils/FileTransferDelegate.m index 9f10ffa86..a8d52941e 100644 --- a/Classes/Utils/FileTransferDelegate.m +++ b/Classes/Utils/FileTransferDelegate.m @@ -115,10 +115,10 @@ static void file_transfer_progress_indication_send(LinphoneChatMessage *message, linphone_content_set_subtype(content, [subtype UTF8String]); linphone_content_set_name(content, [name UTF8String]); linphone_content_set_file_path(content, [[LinphoneManager imagesDirectory] stringByAppendingPathComponent:name].UTF8String); - _message = rootMessage; + _message = rootMessage? : linphone_chat_room_create_empty_message(chatRoom); linphone_chat_message_add_file_content(_message, content); BOOL isOneToOneChat = linphone_chat_room_get_capabilities(chatRoom) & LinphoneChatRoomCapabilitiesOneToOne; - BOOL basic = [ChatConversationView isBasicChatRoom:linphone_chat_message_get_chat_room(rootMessage)]; + BOOL basic = [ChatConversationView isBasicChatRoom:linphone_chat_message_get_chat_room(_message)]; if (!basic && !isOneToOneChat && (_text!=nil && ![_text isEqualToString:@""])) linphone_chat_message_add_utf8_text_content(_message, [_text UTF8String]);