feat: Email sending delays

app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt

@@ -322,6 +322,10 @@ object ApiRepository : ApiRepositoryCore() {
         return callApi(ApiRoutes.resource(unscheduleDraftUrl), DELETE)
     }
 
+    suspend fun unsendMessage(unsendMessageUrl: String): ApiResponse<Boolean> {
+        return callApi(ApiRoutes.resource(unsendMessageUrl), PUT)
+    }
+
     suspend fun rescheduleDraft(draftResource: String, scheduleDate: Date): ApiResponse<Unit> {
         return callApi(ApiRoutes.rescheduleDraft(draftResource, scheduleDate), PUT)
     }

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt

@@ -358,7 +358,7 @@ class ThreadController @Inject constructor(private val mailboxContentRealm: Real
         // If we've already got this Message's Draft beforehand, we need to save
         // its `draftLocalUuid`, otherwise we'll lose the link between them.
         private fun Message.getDraftLocalUuidBlocking(realm: TypedRealm): String? {
-            return if (isDraft) DraftController.getDraftByMessageUidBlocking(uid, realm)?.localUuid else null
+            return if (isDraft && !isScheduledMessage) DraftController.getDraftByMessageUidBlocking(uid, realm)?.localUuid else null
         }
 
         fun deleteSearchThreads(realm: MutableRealm) = with(realm) {

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/refreshStrategies/ThreadRecomputations.kt

@@ -103,7 +103,7 @@ object ThreadRecomputations {
             if (!message.isSeen) unseenMessagesCount++
             from += message.from
             to += message.to
-            if (message.isDraft) hasDrafts = true
+            if (message.isDraft && !message.isScheduledMessage) hasDrafts = true
             if (message.isFavorite) isFavorite = true
             if (message.isAnswered) {
                 isAnswered = true

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

@@ -24,4 +24,7 @@ import kotlinx.serialization.Serializable
 data class SendDraftResult(
     @SerialName("etop")
     val scheduledMessageEtop: String,
+
+    @SerialName("cancel_resource")
+    val cancelResourceUrl: String?,
 )

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

@@ -432,7 +432,7 @@ class Message : RealmObject, Snoozable {
 
     fun hasUnreadContent() = !isSeen || emojiReactions.any { !it.isSeen }
 
-    fun shouldBeExpanded(index: Int, lastIndex: Int) = !isDraft && (hasUnreadContent() || index == lastIndex)
+    fun shouldBeExpanded(index: Int, lastIndex: Int) = (!isDraft || isScheduledMessage) && (hasUnreadContent() || index == lastIndex)
 
     fun toThread() = Thread().apply {
         uid = this@Message.uid

app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

@@ -106,7 +106,9 @@ import java.util.Locale
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.coroutines.resume
-import com.infomaniak.core.legacy.R as RCore
+import kotlin.math.max
+import com.infomaniak.core.common.R as RCore
+import com.infomaniak.core.legacy.R as RCoreLegacy
 
 @AndroidEntryPoint
 class MainActivity : BaseActivity() {
@@ -351,7 +353,10 @@ class MainActivity : BaseActivity() {
                     }
                 }
                 DraftAction.SEND, DraftAction.SEND_REACTION -> {
-                    showSentDraftSnackbar()
+                    // Waits 2s after cancel delay to guarantee the send action is committed
+                    mainViewModel.refreshFoldersAfterSendDelay(localSettings.cancelDelay + 2)
+                    val cancelResourceUrl = getString(DraftsActionsWorker.CANCEL_RESOURCE_URL_KEY)
+                    showSentDraftSnackbar(cancelResourceUrl)
                 }
                 DraftAction.SCHEDULE -> {
                     val scheduleDate = getString(DraftsActionsWorker.SCHEDULED_DRAFT_DATE_KEY)
@@ -389,9 +394,20 @@ class MainActivity : BaseActivity() {
     }
 
     // Still display the Snackbar even if it took three times 10 seconds of timeout to succeed
-    private fun showSentDraftSnackbar() {
+    private fun showSentDraftSnackbar(cancelResourceUrl: String?) {
         showSendingSnackbarTimer.cancel()
-        snackbarManager.setValue(getString(R.string.snackbarEmailSent))
+        if (cancelResourceUrl == null) {
+            snackbarManager.setValue(getString(R.string.snackbarEmailSent))
+        } else {
+            snackbarManager.setValue(
+                title = getString(R.string.snackbarEmailSent),
+                buttonTitle = RCore.string.buttonCancel,
+                customBehavior = { mainViewModel.unsendMessage(cancelResourceUrl) },
+                // Snackbar displays for 2 seconds less than actual cancel delay
+                // to ensure the user sees the snackbar disappear before the action is committed
+                length = max(0, (localSettings.cancelDelay - 2) * 1000)
+            )
+        }
     }
 
     // Still display the Snackbar even if it took three times 10 seconds of timeout to succeed
@@ -555,7 +571,7 @@ class MainActivity : BaseActivity() {
                 trackInAppUpdateEvent(if (isWantingUpdate) MatomoName.DiscoverNow else MatomoName.DiscoverLater)
             },
             onInstallStart = { trackInAppUpdateEvent(MatomoName.InstallUpdate) },
-            onInstallFailure = { snackbarManager.setValue(getString(RCore.string.errorUpdateInstall)) },
+            onInstallFailure = { snackbarManager.setValue(getString(RCoreLegacy.string.errorUpdateInstall)) },
             onInAppUpdateUiChange = { isUpdateDownloaded ->
                 SentryLog.d(APP_UPDATE_TAG, "Must display update button : $isUpdateDownloaded")
                 mainViewModel.canInstallUpdate.value = isUpdateDownloaded

app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt

@@ -852,6 +852,31 @@ class MainViewModel @Inject constructor(
         showUnscheduledDraftSnackbar(apiResponse)
     }
 
+    fun unsendMessage(unsendMessageUrl: String) = viewModelScope.launch(ioCoroutineContext) {
+        val apiResponse = ApiRepository.unsendMessage(unsendMessageUrl)
+        if (apiResponse.isSuccess()) {
+            snackbarManager.postValue(appContext.getString(R.string.snackbarSendCancelled))
+            val draftsFolderId = folderController.getFolder(FolderRole.DRAFT)?.id ?: return@launch
+
+            currentMailbox.value?.let { mailbox ->
+                refreshFoldersAsync(mailbox, ImpactedFolders(mutableSetOf(draftsFolderId)))
+            }
+        } else {
+            snackbarManager.postValue(appContext.getString(R.string.errorSnoozeFailedCancel))
+        }
+    }
+
+    fun refreshFoldersAfterSendDelay(sendDelay: Int) = viewModelScope.launch(ioCoroutineContext) {
+        delay(sendDelay * 1_000L)
+        currentMailbox.value?.let { mailbox ->
+            refreshFoldersAsync(
+                mailbox,
+                ImpactedFolders(mutableSetOf(FolderRole.DRAFT, FolderRole.SENT)),
+                destinationFolderId = folderController.getFolder(FolderRole.SENT)?.id,
+            )
+        }
+    }
+
     private fun showUnscheduledDraftSnackbar(apiResponse: ApiResponse<Unit>) {
 
         fun openDraftFolder() = viewModelScope.launch { folderController.getFolder(FolderRole.DRAFT)?.id?.let(::openFolder) }

app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt

@@ -42,7 +42,7 @@ class SnackbarManager @Inject constructor() {
         onUndoData: ((data: UndoData) -> Unit)? = null,
     ) = with(snackbarFeedback) {
         removeObservers(activity)
-        observe(activity) { (title, undoData, buttonTitleRes, customBehavior) ->
+        observe(activity) { (title, undoData, buttonTitleRes, customBehavior, length) ->
             val action: (() -> Unit)? = if (undoData != null) {
                 { onUndoData?.invoke(undoData) }
             } else {
@@ -59,6 +59,7 @@ class SnackbarManager @Inject constructor() {
                 anchor = getAnchor?.invoke(),
                 actionButtonTitle = buttonTitle,
                 onActionClicked = safeAction,
+                length = length,
             )
         }
     }
@@ -75,19 +76,32 @@ class SnackbarManager @Inject constructor() {
         }
     }
 
-    fun setValue(title: String, undoData: UndoData? = null, buttonTitle: Int? = null, customBehavior: (() -> Unit)? = null) {
-        snackbarFeedback.value = SnackbarData(title, undoData, buttonTitle, customBehavior)
+    fun setValue(
+        title: String,
+        undoData: UndoData? = null,
+        buttonTitle: Int? = null,
+        customBehavior: (() -> Unit)? = null,
+        length: Int = Snackbar.LENGTH_LONG,
+    ) {
+        snackbarFeedback.value = SnackbarData(title, undoData, buttonTitle, customBehavior, length)
     }
 
-    fun postValue(title: String, undoData: UndoData? = null, buttonTitle: Int? = null, customBehavior: (() -> Unit)? = null) {
-        snackbarFeedback.postValue(SnackbarData(title, undoData, buttonTitle, customBehavior))
+    fun postValue(
+        title: String,
+        undoData: UndoData? = null,
+        buttonTitle: Int? = null,
+        customBehavior: (() -> Unit)? = null,
+        length: Int = Snackbar.LENGTH_LONG,
+    ) {
+        snackbarFeedback.postValue(SnackbarData(title, undoData, buttonTitle, customBehavior, length))
     }
 
     private data class SnackbarData(
         val title: String,
         val undoData: UndoData?,
         @StringRes val buttonTitle: Int?,
         val customBehavior: (() -> Unit)?,
+        val length: Int,
     )
 
     data class UndoData(

app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt

@@ -185,6 +185,12 @@ class SettingsFragment : Fragment() {
             settingsThreadMode.setSubtitle(threadMode.localisedNameRes)
             settingsExternalContent.setSubtitle(externalContent.localisedNameRes)
             settingsAutomaticAdvance.setSubtitle(autoAdvanceMode.localisedNameRes)
+            val cancelDelaySubtitle = if (cancelDelay == 0) {
+                getString(R.string.settingsDisabled)
+            } else {
+                getString(R.string.settingsDelaySeconds, cancelDelay)
+            }
+            settingsCancellationPeriod.setSubtitle(cancelDelaySubtitle)
             lifecycleScope.launch {
                 UserDatabase().userDao().allUsers.map { list -> list.any { it.isStaff } }.collectLatest { hasStaffAccount ->
                     if (!hasStaffAccount) return@collectLatest
@@ -238,6 +244,10 @@ class SettingsFragment : Fragment() {
             safelyAnimatedNavigation(SettingsFragmentDirections.actionSettingsToAutoAdvanceSettings(), currentClassName)
         }
 
+        settingsCancellationPeriod.setOnClickListener {
+            safelyAnimatedNavigation(SettingsFragmentDirections.actionSettingsToCancelDelaySetting(), currentClassName)
+        }
+
         settingsThreadListDensity.setOnClickListener {
             safelyAnimatedNavigation(SettingsFragmentDirections.actionSettingsToThreadListDensitySetting(), currentClassName)
         }

app/src/main/java/com/infomaniak/mail/ui/main/settings/send/CancelDelaySettingFragment.kt

@@ -26,7 +26,6 @@ import com.infomaniak.core.legacy.utils.safeBinding
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.databinding.FragmentCancelDelaySettingBinding
-import com.infomaniak.mail.utils.extensions.notYetImplemented
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -49,8 +48,7 @@ class CancelDelaySettingFragment : Fragment() {
         checkInitialValue()
 
         binding.radioGroup.onItemCheckedListener { _, value, _ ->
-            notYetImplemented()
-            val seconds = value?.toInt() ?: throw NullPointerException("Radio button had no associated value")
+            val seconds = value?.toInt() ?: return@onItemCheckedListener
             localSettings.cancelDelay = seconds
         }
     }

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

@@ -332,7 +332,9 @@ class ThreadAdapter(
     }
 
     private fun initMapForNewMessage(message: Message, position: Int) = with(threadAdapterState) {
-        if (isExpandedMap[message.uid] == null) {
+        val wasScheduledMessageNowDraft = isExpandedMap[message.uid] != null && message.isDraft && !message.isScheduledMessage
+
+        if (isExpandedMap[message.uid] == null || wasScheduledMessageNowDraft) {
             isExpandedMap[message.uid] = message.shouldBeExpanded(position, items.lastIndex)
         }
 
@@ -431,7 +433,7 @@ class ThreadAdapter(
     private fun MessageViewHolder.bindHeader(message: Message) = with(binding) {
         val messageDate = message.displayDate.toDate()
 
-        if (message.isDraft) {
+        if (message.isDraft && !message.isScheduledMessage) {
             userAvatar.loadUserAvatar(AccountUtils.currentUser!!)
             expeditorName.apply {
                 text = context.getString(R.string.messageIsDraftOption)
@@ -485,7 +487,7 @@ class ThreadAdapter(
                     isExpandedMap[message.uid] = false
                     onExpandOrCollapseMessage(message, shouldTrack = true)
                 } else {
-                    if (message.isDraft) {
+                    if (message.isDraft && !message.isScheduledMessage) {
                         threadAdapterCallbacks?.onDraftClicked?.invoke(message)
                     } else {
                         isExpandedMap[message.uid] = true
@@ -917,17 +919,18 @@ class ThreadAdapter(
 
     private fun ItemMessageBinding.setHeaderState(message: Message, isExpanded: Boolean) {
         deleteDraftButton.apply {
-            isVisible = message.isDraft
+            isVisible = message.isDraft && !message.isScheduledMessage
             setOnClickListener { threadAdapterCallbacks?.onDeleteDraftClicked?.invoke(message) }
         }
         replyButton.apply {
-            isVisible = isExpanded && message.isScheduledDraft.not()
+            isVisible = isExpanded && !message.isScheduledDraft && !message.isScheduledMessage
             setOnClickListener { threadAdapterCallbacks?.onReplyClicked?.invoke(message) }
         }
         menuButton.apply {
-            isVisible = isExpanded && message.isScheduledDraft.not()
+            isVisible = isExpanded && !message.isScheduledDraft && !message.isScheduledMessage
             setOnClickListener { threadAdapterCallbacks?.onMenuClicked?.invoke(message) }
         }
+        sendingProgressText.isVisible = message.isScheduledMessage
 
         recipient.text = if (isExpanded) getAllRecipientsFormatted(message) else context.formatSubject(message.subject)
         recipientChevron.isVisible = isExpanded
@@ -1086,7 +1089,9 @@ class ThreadAdapter(
                     // check for anything that doesn't need to handle bind with precision using a custom payload
                     message.body?.value == oldMessage.message.body?.value &&
                             message.splitBody == oldMessage.message.splitBody &&
-                            message.shouldHideDivider == oldMessage.message.shouldHideDivider
+                            message.shouldHideDivider == oldMessage.message.shouldHideDivider &&
+                            message.isDraft == oldMessage.message.isDraft &&
+                            message.isScheduledMessage == oldMessage.message.isScheduledMessage
                 })
             }
         }

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

@@ -51,6 +51,7 @@ import com.infomaniak.mail.MatomoMail.trackExternalEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.MatomoMail.trackSendingDraftEvent
 import com.infomaniak.mail.R
+import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.api.ApiRepository
 import com.infomaniak.mail.data.cache.RealmDatabase
 import com.infomaniak.mail.data.cache.mailboxContent.DraftController
@@ -158,6 +159,7 @@ class NewMessageViewModel @Inject constructor(
     private val sharedUtils: SharedUtils,
     private val signatureUtils: SignatureUtils,
     private val snackbarManager: SnackbarManager,
+    private val localSettings: LocalSettings,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
 ) : AndroidViewModel(application) {
@@ -1005,6 +1007,8 @@ class NewMessageViewModel @Inject constructor(
         cc = ccLiveData.valueOrEmpty().toRealmList()
         bcc = bccLiveData.valueOrEmpty().toRealmList()
 
+        if (draftAction == DraftAction.SEND) delay = localSettings.cancelDelay
+
         updateDraftAttachmentsWithLiveData(
             uiAttachments = attachmentsLiveData.valueOrEmpty(),
             step = "executeDraftActionWhenStopping (action = ${draftAction.name}) -> updateDraftFromLiveData",

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

@@ -166,6 +166,7 @@ class DraftsActionsWorker @AssistedInject constructor(
         const val RESULT_USER_ID_KEY = "resultUserIdKey"
         const val SCHEDULED_DRAFT_DATE_KEY = "scheduledDraftDateKey"
         const val UNSCHEDULE_DRAFT_URL_KEY = "unscheduleDraftUrlKey"
+        const val CANCEL_RESOURCE_URL_KEY = "cancelResourceUrlKey"
         const val IS_SUCCESS = "isSuccess"
 
         const val EMOJI_SENT_STATUS = "emojiSentStatusKey"