Fix canceled event detection

Infomaniak · Jun 5, 2024 · e1e9448 · e1e9448
1 parent aafc8c5
commit e1e9448
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/RealmDatabase.kt b/app/src/main/java/com/infomaniak/mail/data/cache/RealmDatabase.kt
@@ -162,7 +162,7 @@ object RealmDatabase {
         //region Configurations versions
         const val USER_INFO_SCHEMA_VERSION = 1L
         const val MAILBOX_INFO_SCHEMA_VERSION = 5L
-        const val MAILBOX_CONTENT_SCHEMA_VERSION = 12L
+        const val MAILBOX_CONTENT_SCHEMA_VERSION = 13L
         //endregion
 
         //region Configurations names

diff --git a/app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEvent.kt b/app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEvent.kt
@@ -19,6 +19,7 @@
 
 package com.infomaniak.mail.data.models.calendar
 
+import com.infomaniak.lib.core.utils.Utils
 import com.infomaniak.mail.data.api.CalendarRealmInstantSerializer
 import com.infomaniak.mail.utils.extensions.toRealmInstant
 import io.realm.kotlin.ext.realmListOf
@@ -46,8 +47,12 @@ class CalendarEvent() : EmbeddedRealmObject {
     var start: RealmInstant = Date(0).toRealmInstant()
     var end: RealmInstant = Date(0).toRealmInstant()
     var attendees: RealmList<Attendee> = realmListOf()
+    @SerialName("status")
+    private var _status: String? = null
     //endregion
 
+    val status: CalendarEventStatus? get() = Utils.enumValueOfOrNull<CalendarEventStatus>(_status)
+
     constructor(
         id: Int,
         type: String,
@@ -76,6 +81,7 @@ class CalendarEvent() : EmbeddedRealmObject {
         if (location != other.location) return false
         if (isFullDay != other.isFullDay) return false
         if (start != other.start) return false
+        if (_status != other._status) return false
 
         return end == other.end
     }
@@ -96,8 +102,15 @@ class CalendarEvent() : EmbeddedRealmObject {
         result = 31 * result + isFullDay.hashCode()
         result = 31 * result + start.hashCode()
         result = 31 * result + end.hashCode()
+        result = 31 * result + _status.hashCode()
         result = 31 * result + attendees.hashCode()
 
         return result
     }
+
+    enum class CalendarEventStatus(val apiValue: String) {
+        CONFIRMED("CONFIRMED"),
+        TENTATIVE("TENTATIVE"),
+        CANCELLED("CANCELLED"),
+    }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEventResponse.kt b/app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEventResponse.kt
@@ -18,6 +18,7 @@
 package com.infomaniak.mail.data.models.calendar
 
 import com.infomaniak.lib.core.utils.Utils
+import com.infomaniak.mail.data.models.calendar.CalendarEvent.CalendarEventStatus
 import com.infomaniak.mail.utils.extensions.isUserIn
 import io.realm.kotlin.types.EmbeddedRealmObject
 import kotlinx.serialization.SerialName
@@ -54,7 +55,7 @@ class CalendarEventResponse() : EmbeddedRealmObject {
 
     val calendarEvent get() = userStoredEvent ?: attachmentEvent
 
-    val isCanceled get() = isUserStoredEventDeleted || attachmentEventMethod == AttachmentEventMethod.CANCEL
+    val isCanceled get() = calendarEvent?.status == CalendarEventStatus.CANCELLED
 
     fun isReplyAuthorized(): Boolean {
         return (attachmentEventMethod == null || attachmentEventMethod == AttachmentEventMethod.REQUEST)