Clean code

Author: LunarX

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

@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2022-2024 Infomaniak Network SA
+ * Copyright (C) 2022-2023 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEventResponse.kt

@@ -41,7 +41,6 @@ class CalendarEventResponse : EmbeddedRealmObject {
     fun hasUserStoredEvent() = userStoredEvent != null
 
     fun hasAttachmentEvent() = attachmentEvent != null
-
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
@@ -50,13 +49,15 @@ class CalendarEventResponse : EmbeddedRealmObject {
 
         if (userStoredEvent != other.userStoredEvent) return false
         if (userStoredEventDeleted != other.userStoredEventDeleted) return false
-        return attachmentEvent == other.attachmentEvent
+        if (attachmentEvent != other.attachmentEvent) return false
+        return _attachmentEventMethod == other._attachmentEventMethod
     }
 
     override fun hashCode(): Int {
         var result = userStoredEvent?.hashCode() ?: 0
         result = 31 * result + userStoredEventDeleted.hashCode()
         result = 31 * result + (attachmentEvent?.hashCode() ?: 0)
+        result = 31 * result + (_attachmentEventMethod?.hashCode() ?: 0)
         return result
     }
 

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

@@ -124,7 +124,7 @@ class Message : RealmObject {
     @Transient
     var isDeletedOnApi: Boolean = false
     @Transient
-    var latestCalendarEventResponse: CalendarEventResponse? = null // TODO : Migration? If message already exists set it to null
+    var latestCalendarEventResponse: CalendarEventResponse? = null
     //endregion
 
     //region UI data (Transient & Ignore)

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

@@ -331,7 +331,7 @@ class ThreadFragment : Fragment() {
 
             threadViewModel.fetchMessagesHeavyData(messages)
 
-            val currentMailboxUuid = mainViewModel.currentMailbox.value!!.uuid // TODO : What do we do if value is null?
+            val currentMailboxUuid = mainViewModel.currentMailbox.value!!.uuid
             if (threadViewModel.getCalendarEventTreatedMessageCount() != messages.count()) {
                 threadViewModel.fetchCalendarEvents(messages, currentMailboxUuid)
             }

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

@@ -32,6 +32,7 @@ import com.infomaniak.mail.data.models.calendar.CalendarEvent
 import com.infomaniak.mail.databinding.ViewCalendarEventBannerBinding
 import com.infomaniak.mail.utils.UiUtils.getPrettyNameAndEmail
 import com.infomaniak.mail.utils.toDate
+import io.realm.kotlin.types.RealmList
 import io.sentry.Sentry
 import java.time.format.FormatStyle
 import java.util.Date
@@ -72,14 +73,7 @@ class CalendarEventBannerView @JvmOverloads constructor(
             text = calendarEvent.location
         }
 
-        val iAmPartOfAttendees = calendarEvent.attendees.any { it.isMe() }
-        notPartOfAttendeesWarning.isGone = iAmPartOfAttendees
-        participationButtons.isVisible = iAmPartOfAttendees
-        attendeesLayout.isGone = calendarEvent.attendees.isEmpty()
-
-        displayOrganizer(calendarEvent.attendees)
-        allAttendeesButton.setOnClickListener { navigateToAttendeesBottomSheet?.invoke(calendarEvent.attendees) }
-        manyAvatarsView.setAttendees(calendarEvent.attendees)
+        setAttendees(calendarEvent.attendees)
     }
 
     private fun setWarnings(startDate: Date, hasBeenDeleted: Boolean) = with(binding) {
@@ -117,6 +111,17 @@ class CalendarEventBannerView @JvmOverloads constructor(
         }
     }
 
+    private fun setAttendees(attendees: RealmList<Attendee>) = with(binding) {
+        val iAmPartOfAttendees = attendees.any { it.isMe() }
+        notPartOfAttendeesWarning.isGone = iAmPartOfAttendees
+        participationButtons.isVisible = iAmPartOfAttendees
+        attendeesLayout.isGone = attendees.isEmpty()
+
+        displayOrganizer(attendees)
+        allAttendeesButton.setOnClickListener { navigateToAttendeesBottomSheet?.invoke(attendees) }
+        manyAvatarsView.setAttendees(attendees)
+    }
+
     fun initCallback(navigateToAttendeesBottomSheet: (List<Attendee>) -> Unit) {
         this.navigateToAttendeesBottomSheet = navigateToAttendeesBottomSheet
     }
@@ -142,7 +147,7 @@ class CalendarEventBannerView @JvmOverloads constructor(
                 scope.setExtra("amount of organizer", organizers.count().toString())
                 scope.setExtra("have same email", organizers.all { it.email == organizers[0].email }.toString())
                 scope.setExtra("have same name", organizers.all { it.name == organizers[0].name }.toString())
-                Sentry.captureMessage("Found more than one organizer for this event")
+                Sentry.captureMessage("Found more than one organizer for an event")
             }
         }
 

app/src/main/java/com/infomaniak/mail/utils/Extensions.kt

@@ -104,12 +104,9 @@ import io.realm.kotlin.types.RealmObject
 import kotlinx.serialization.encodeToString
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
-import java.lang.IllegalArgumentException
-import java.text.SimpleDateFormat
 import java.time.*
 import java.util.Calendar
 import java.util.Date
-import java.util.Objects
 import java.util.Scanner
 import kotlin.math.roundToInt