mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 02:58:07 +00:00
Fix message bubble display for text messages with media
This commit is contained in:
parent
2788bb2132
commit
9d9f46f4e7
2 changed files with 15 additions and 5 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue