diff --git a/Linphone/UI/Main/Conversations/Model/ConversationModel.swift b/Linphone/UI/Main/Conversations/Model/ConversationModel.swift index 9849cf2ca..a351aa320 100644 --- a/Linphone/UI/Main/Conversations/Model/ConversationModel.swift +++ b/Linphone/UI/Main/Conversations/Model/ConversationModel.swift @@ -292,9 +292,24 @@ class ConversationModel: ObservableObject, Identifiable { fromAddressFriend = nil } - let lastMessageTextTmp = (fromAddressFriend ?? "") + var lastMessageTextTmp = (fromAddressFriend ?? "") + (lastMessage!.contents.first(where: {$0.isText == true})?.utf8Text ?? (lastMessage!.contents.first(where: {$0.isFile == true || $0.isFileTransfer == true})?.name ?? "")) + if lastMessage!.contents.first != nil && lastMessage!.contents.first!.isIcalendar == true { + if let conferenceInfo = try? Factory.Instance.createConferenceInfoFromIcalendarContent(content: lastMessage!.contents.first!) { + if conferenceInfo.uri != nil { + //let meetingSubjectTmp = conferenceInfo.subject ?? "" + if conferenceInfo.state == .New { + lastMessageTextTmp = String(localized: "message_meeting_invitation_notification") + } else if conferenceInfo.state == .Updated { + lastMessageTextTmp = String(localized: "message_meeting_invitation_updated_notification") + } else if conferenceInfo.state == .Cancelled { + lastMessageTextTmp = String(localized: "message_meeting_invitation_cancelled_notification") + } + } + } + } + let lastMessageIsOutgoingTmp = lastMessage?.isOutgoing ?? false let lastUpdateTimeTmp = lastMessage?.time ?? chatRoom.lastUpdateTime