Fix message bubble display for text messages with media

This commit is contained in:
Benoit Martins 2025-06-30 10:48:58 +02:00
parent 2788bb2132
commit 9d9f46f4e7
2 changed files with 15 additions and 5 deletions

View file

@ -626,10 +626,20 @@ struct ChatBubbleView: View {
.onTapGesture {
if eventLogMessage.message.attachments.first!.type == .fileTransfer && eventLogMessage.message.attachments.first!.transferProgressIndication == -1 {
CoreContext.shared.doOnCoreQueue { _ in
conversationViewModel.downloadContent(
chatMessage: eventLogMessage.eventModel.eventLog.chatMessage!,
content: eventLogMessage.eventModel.eventLog.chatMessage!.contents.first!
)
if let chatMessage = eventLogMessage.eventModel.eventLog.chatMessage {
if let firstContent = chatMessage.contents.first, firstContent.type != "text" {
conversationViewModel.downloadContent(
chatMessage: chatMessage,
content: firstContent
)
} else if chatMessage.contents.count >= 2 {
let secondContent = chatMessage.contents[1]
conversationViewModel.downloadContent(
chatMessage: chatMessage,
content: secondContent
)
}
}
}
} else {
selectedURLAttachment = eventLogMessage.message.attachments.first!.full

View file

@ -234,7 +234,7 @@ class ConversationViewModel: ObservableObject {
statusTmp = .sending
}
if msgState == .FileTransferDone {
message.contents.enumerated().forEach { (contentIndex, content) in
message.contents.filter({ $0.type != "text" }).enumerated().forEach { (contentIndex, content) in
guard
let indexMessage = self.conversationMessagesSection[0].rows.firstIndex(where: { $0.eventModel.eventLogId == message.messageId }),
contentIndex < self.conversationMessagesSection[0].rows[indexMessage].message.attachments.count