refactor: Rename AttachmentUpload statuses

Author: KevinBoulongne

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

@@ -58,7 +58,7 @@ class Attachment : EmbeddedRealmObject, Attachable {
     @Transient
     var uploadLocalUri: String? = null
     @Transient
-    private var _uploadStatus: String = AttachmentUploadStatus.AWAITING.name
+    private var _uploadStatus: String = AttachmentUploadStatus.NOT_UPLOADED.name
     //endregion
 
     val attachmentUploadStatus: AttachmentUploadStatus?
@@ -85,7 +85,7 @@ class Attachment : EmbeddedRealmObject, Attachable {
     fun backupLocalData(oldAttachment: Attachment, draft: Draft) {
         localUuid = oldAttachment.localUuid
         uploadLocalUri = oldAttachment.uploadLocalUri
-        setUploadStatus(AttachmentUploadStatus.FINISHED, draft, "backupLocalData -> setUploadStatus")
+        setUploadStatus(AttachmentUploadStatus.UPLOADED, draft, "backupLocalData -> setUploadStatus")
     }
 
     fun setUploadStatus(attachmentUploadStatus: AttachmentUploadStatus, draft: Draft? = null, step: String = "") {

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

@@ -18,6 +18,6 @@
 package com.infomaniak.mail.data.models
 
 enum class AttachmentUploadStatus {
-    AWAITING,
-    FINISHED,
+    NOT_UPLOADED,
+    UPLOADED,
 }

app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt

@@ -323,7 +323,7 @@ class NewMessageViewModel @Inject constructor(
                 ApiRepository.attachmentsToForward(mailboxUuid, previousMessage).data?.attachments?.forEach { attachment ->
                     draft.attachments += attachment.apply {
                         resource = previousMessage.attachments.find { it.name == name }?.resource
-                        setUploadStatus(AttachmentUploadStatus.FINISHED)
+                        setUploadStatus(AttachmentUploadStatus.UPLOADED)
                     }
                     SentryDebug.addDraftBreadcrumbs(draft, step = "set previousMessage when reply/replyAll/Forward")
                 }
@@ -507,11 +507,11 @@ class NewMessageViewModel @Inject constructor(
         return ApiRepository.getDraft(draftResource!!).data?.also { draft ->
 
             /**
-             * If we are opening for the 1st time an existing Draft created somewhere else (ex: webmail),
-             * we need to set all of its Attachments to `FINISHED`, so we don't try to upload them again.
+             * If we are opening for the 1st time an existing Draft created somewhere else (ex: webmail), we need to
+             * set all of its Attachments to [AttachmentUploadStatus.UPLOADED], so we don't try to upload them again.
              */
             draft.attachments.forEach {
-                it.setUploadStatus(AttachmentUploadStatus.FINISHED, draft, "fetchDraft at NewMessage opening")
+                it.setUploadStatus(AttachmentUploadStatus.UPLOADED, draft, "fetchDraft at NewMessage opening")
             }
 
             /**
@@ -989,7 +989,7 @@ class NewMessageViewModel @Inject constructor(
          * Then it means the Attachments list hasn't been edited by the user, so we have nothing to do here.
          */
         val isForwardingUneditedAttachmentsList = draftMode == DraftMode.FORWARD &&
-                uiAttachments.all { it.attachmentUploadStatus == AttachmentUploadStatus.FINISHED } &&
+                uiAttachments.all { it.attachmentUploadStatus == AttachmentUploadStatus.UPLOADED } &&
                 uiAttachments.count() == attachments.count()
         if (isForwardingUneditedAttachmentsList) return
 
@@ -1002,7 +1002,7 @@ class NewMessageViewModel @Inject constructor(
              * be some data for Attachments in Realm (for example, the `uuid`). If we don't take back the Realm version of the
              * Attachment, this data will be lost forever and we won't be able to save/send the Draft.
              */
-            return@map if (localAttachment != null && localAttachment.attachmentUploadStatus != AttachmentUploadStatus.AWAITING) {
+            return@map if (localAttachment != null && localAttachment.attachmentUploadStatus == AttachmentUploadStatus.UPLOADED) {
                 localAttachment.copyFromRealm()
             } else {
                 uiAttachment

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

@@ -49,7 +49,7 @@ suspend fun uploadAttachmentsWithMutex(
 private suspend fun Draft.uploadAttachments(mailbox: Mailbox, draftController: DraftController, realm: Realm) {
 
     fun getAwaitingAttachments(): List<Attachment> = attachments.filter {
-        it.attachmentUploadStatus == AttachmentUploadStatus.AWAITING
+        it.attachmentUploadStatus == AttachmentUploadStatus.NOT_UPLOADED
     }
 
     suspend fun setUploadStatus(attachment: Attachment, uploadStatus: AttachmentUploadStatus, step: String) {

app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt

@@ -325,7 +325,7 @@ class DraftsActionsWorker @AssistedInject constructor(
         SentryDebug.addDraftBreadcrumbs(draft, step = "executeDraftAction (action = ${draft.action?.name.toString()})")
 
         // TODO: Remove this whole `draft.attachments.any { … }` + `addDraftBreadcrumbs()` when the Attachments issue is fixed.
-        if (draft.attachments.any { it.attachmentUploadStatus != AttachmentUploadStatus.FINISHED }) {
+        if (draft.attachments.any { it.attachmentUploadStatus != AttachmentUploadStatus.UPLOADED }) {
 
             Sentry.captureMessage(
                 "We tried to [${draft.action?.name}] a Draft, but an Attachment wasn't uploaded.",