From b4b51c8e77d29b5af3eded58c5ab1423407f911c Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 20 Feb 2023 11:49:12 +0100 Subject: [PATCH] Fix voiceRecorder message with text --- .../Chat/Views/ChatConversationViewSwift.swift | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift index c3c97af8d..ba0ddcb05 100644 --- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift +++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift @@ -694,7 +694,20 @@ import AVFoundation let voiceContent = linphone_recorder_create_content(ChatConversationViewModel.sharedModel.voiceRecorder?.getCobject) ChatConversationViewModel.sharedModel.isPendingVoiceRecord = false cancelVoiceRecording() - linphone_chat_message_add_content(rootMessage, voiceContent) + let conference = ChatConversationViewModel.sharedModel.chatRoom!.hasCapability(mask: Int(LinphoneChatRoomCapabilitiesConference.rawValue)) + if (linphone_chat_room_get_capabilities(ChatConversationViewModel.sharedModel.chatRoom?.getCobject) != 0) && conference { + linphone_chat_message_add_content(rootMessage, voiceContent) + }else{ + if messageView.messageText.text != "" { + let rootMessageText = !replyBubble.isHidden ? linphone_chat_room_create_reply_message(ChatConversationViewModel.sharedModel.chatRoom?.getCobject, ChatConversationViewModel.sharedModel.replyMessage) : linphone_chat_room_create_empty_message(ChatConversationViewModel.sharedModel.chatRoom?.getCobject) + let result = ChatMessage.getSwiftObject(cObject: rootMessageText!) + sendMessageInMessageField(rootMessage: result) + + linphone_chat_message_add_content(rootMessage, voiceContent) + }else{ + linphone_chat_message_add_content(rootMessage, voiceContent) + } + } } if ChatConversationViewModel.sharedModel.fileContext.count > 0 { let conference = ChatConversationViewModel.sharedModel.chatRoom!.hasCapability(mask: Int(LinphoneChatRoomCapabilitiesConference.rawValue))