Factorize calendar attachment detection

Author: LunarX

app/src/main/java/com/infomaniak/mail/data/models/message/Message.kt

@@ -167,6 +167,8 @@ class Message : RealmObject {
             if (it == null) SentryLog.e("ThreadAdapter", "Message $uid has empty from")
         }
 
+    val calendarAttachment: Attachment? get() = attachments.singleOrNull(Attachment::isCalendarEvent)
+
     val dkimStatus: MessageDKIM get() = enumValueOfOrNull<MessageDKIM>(_dkimStatus) ?: MessageDKIM.VALID
 
     enum class MessageDKIM {

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt

@@ -180,7 +180,7 @@ class ThreadAdapter(
     }
 
     private fun ThreadViewHolder.bindCalendarEvent(message: Message) {
-        val attachment = message.attachments.singleOrNull(Attachment::isCalendarEvent) ?: return
+        val attachment = message.calendarAttachment ?: return
         val calendarEvent = message.latestCalendarEventResponse?.calendarEvent
 
         binding.calendarEvent.apply {

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadViewModel.kt

@@ -28,7 +28,6 @@ import com.infomaniak.mail.data.cache.mailboxContent.RefreshController
 import com.infomaniak.mail.data.cache.mailboxContent.RefreshController.RefreshMode
 import com.infomaniak.mail.data.cache.mailboxContent.ThreadController
 import com.infomaniak.mail.data.cache.mailboxInfo.MailboxController
-import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.thread.Thread
@@ -200,10 +199,7 @@ class ThreadViewModel @Inject constructor(
                     val alreadyTreated = !treatedMessagesForCalendarEvent.add(message.uid)
                     if (alreadyTreated) return@forEach
 
-                    val icsAttachments = message.attachments.filter(Attachment::isCalendarEvent)
-                    if (icsAttachments.count() != 1) return@forEach
-
-                    val icsAttachment = icsAttachments.single()
+                    val icsAttachment = message.calendarAttachment ?: return@forEach
 
                     val calendarEventResponse = icsAttachment.resource?.let { resource ->
                         ApiRepository.getAttachmentCalendarEvent(resource)