Upload all unfinished Attachments

KevinBoulongne · KevinBoulongne · commit 82c2fdba17f9 · 2024-09-02T13:25:34.000+02:00
diff --git a/app/src/main/java/com/infomaniak/mail/utils/DraftUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/DraftUtils.kt
@@ -47,7 +47,7 @@ suspend fun uploadAttachmentsWithMutex(
 
 private suspend fun Draft.uploadAttachments(mailbox: Mailbox, draftController: DraftController, realm: Realm) {
 
-    fun getAwaitingAttachments(): List<Attachment> = attachments.filter { it.uploadStatus == UploadStatus.AWAITING }
+    fun getUnfinishedAttachments(): List<Attachment> = attachments.filterNot { it.uploadStatus == UploadStatus.FINISHED }
 
     fun setUploadStatus(attachment: Attachment, uploadStatus: UploadStatus, step: String) {
         realm.writeBlocking {
@@ -57,7 +57,7 @@ private suspend fun Draft.uploadAttachments(mailbox: Mailbox, draftController: D
         }
     }
 
-    val attachmentsToUpload = getAwaitingAttachments()
+    val attachmentsToUpload = getUnfinishedAttachments()
     val attachmentsToUploadCount = attachmentsToUpload.count()
     if (attachmentsToUploadCount > 0) {
         SentryLog.d(ATTACHMENT_TAG, "Uploading $attachmentsToUploadCount attachments")

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ suspend fun uploadAttachmentsWithMutex(`
`47`	`47`
`48`	`48`	`private suspend fun Draft.uploadAttachments(mailbox: Mailbox, draftController: DraftController, realm: Realm) {`
`49`	`49`
`50`		`- fun getAwaitingAttachments(): List<Attachment> = attachments.filter { it.uploadStatus == UploadStatus.AWAITING }`
	`50`	`+ fun getUnfinishedAttachments(): List<Attachment> = attachments.filterNot { it.uploadStatus == UploadStatus.FINISHED }`
`51`	`51`
`52`	`52`	`fun setUploadStatus(attachment: Attachment, uploadStatus: UploadStatus, step: String) {`
`53`	`53`	`realm.writeBlocking {`
`@@ -57,7 +57,7 @@ private suspend fun Draft.uploadAttachments(mailbox: Mailbox, draftController: D`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- val attachmentsToUpload = getAwaitingAttachments()`
	`60`	`+ val attachmentsToUpload = getUnfinishedAttachments()`
`61`	`61`	`val attachmentsToUploadCount = attachmentsToUpload.count()`
`62`	`62`	`if (attachmentsToUploadCount > 0) {`
`63`	`63`	`SentryLog.d(ATTACHMENT_TAG, "Uploading $attachmentsToUploadCount attachments")`