From c62f707ee5f98fbf9cb4edf688bb7c58d436f34d Mon Sep 17 00:00:00 2001
From: Kevin Boulongne <kevin.boulongne@infomaniak.com>
Date: Mon, 3 Feb 2025 16:46:14 +0100
Subject: [PATCH] refactor: Clean code

---
 .../com/infomaniak/mail/ui/MainViewModel.kt   | 24 +++++++++----------
 ...electDateAndTimeForScheduledDraftDialog.kt |  3 +--
 .../ScheduleSendBottomSheetDialog.kt          |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 848290974a..63c5c906bf 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -603,20 +603,20 @@ class MainViewModel @Inject constructor(
 
     //region Scheduled Drafts
     fun rescheduleDraft(scheduleDate: Date) = viewModelScope.launch(ioCoroutineContext) {
-        val draftResource = this@MainViewModel.draftResource
-
-        if (draftResource.isNullOrBlank()) {
-            snackbarManager.postValue(title = appContext.getString(RCore.string.anErrorHasOccurred))
-            return@launch
-        }
+        draftResource.let { resource ->
+            if (resource.isNullOrBlank()) {
+                snackbarManager.postValue(title = appContext.getString(RCore.string.anErrorHasOccurred))
+                return@launch
+            }
 
-        val apiResponse = ApiRepository.rescheduleDraft(draftResource, scheduleDate)
+            val apiResponse = ApiRepository.rescheduleDraft(resource, scheduleDate)
 
-        if (apiResponse.isSuccess()) {
-            val scheduledDraftsFolderId = folderController.getFolder(FolderRole.SCHEDULED_DRAFTS)!!.id
-            refreshFoldersAsync(currentMailbox.value!!, listOf(scheduledDraftsFolderId))
-        } else {
-            snackbarManager.postValue(title = appContext.getString(apiResponse.translatedError))
+            if (apiResponse.isSuccess()) {
+                val scheduledDraftsFolderId = folderController.getFolder(FolderRole.SCHEDULED_DRAFTS)!!.id
+                refreshFoldersAsync(currentMailbox.value!!, listOf(scheduledDraftsFolderId))
+            } else {
+                snackbarManager.postValue(title = appContext.getString(apiResponse.translatedError))
+            }
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt
index 0c7abd30bd..a6c405f20d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt
@@ -129,8 +129,7 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
             val hour: Int = timePicker!!.hour
             val minute: Int = timePicker!!.minute
 
-            selectedDate = selectedDate.setHour(hour)
-                .setMinute(minute)
+            selectedDate = selectedDate.setHour(hour).setMinute(minute)
 
             binding.timeField.setText(selectedDate.format(FORMAT_DATE_HOUR_MINUTE))
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt
index b659c0913d..ff8d13ddab 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt
@@ -60,7 +60,7 @@ class ScheduleSendBottomSheetDialog @Inject constructor() : ActionsBottomSheetDi
                     context,
                     date = Date(lastSelectedScheduleEpoch),
                     format = FORMAT_DATE_DAY_MONTH,
-                )
+                ),
             )
         }
     }