From 20da49167cf4f6d44235c2ae6eaba6f7a5de2c8f Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Thu, 30 Jan 2025 13:33:06 +0100
Subject: [PATCH] Refactor event log check in getNewMessages for better
 readability and safety

---
 .../Conversations/ViewModel/ConversationViewModel.swift    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
index 31bd7c6b9..bc8d7f756 100644
--- a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
+++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
@@ -1006,7 +1006,12 @@ class ConversationViewModel: ObservableObject {
 	}
 	
 	func getNewMessages(eventLogs: [EventLog]) {
-		if self.conversationMessagesSection[0].rows.first?.eventModel.eventLogId != eventLogs.last?.chatMessage?.messageId {
+		if let firstEventLogId = self.conversationMessagesSection[0].rows.first?.eventModel.eventLogId,
+		   let lastMessageId = eventLogs.last?.chatMessage?.messageId,
+		   !eventLogs.isEmpty,
+		   !self.conversationMessagesSection.isEmpty,
+		   !self.conversationMessagesSection[0].rows.isEmpty,
+		   firstEventLogId != lastMessageId {
 			eventLogs.enumerated().forEach { index, eventLog in
 				var attachmentNameList: String = ""
 				var attachmentList: [Attachment] = []