refactor: Clean code

Infomaniak · Feb 3, 2025 · c62f707 · c62f707
1 parent 8329a95
commit c62f707
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 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
@@ -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/...main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt b/...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
@@ -60,7 +60,7 @@ class ScheduleSendBottomSheetDialog @Inject constructor() : ActionsBottomSheetDi
                     context,
                     date = Date(lastSelectedScheduleEpoch),
                     format = FORMAT_DATE_DAY_MONTH,
-                )
+                ),
             )
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                         context,
                         date = Date(lastSelectedScheduleEpoch),
                         format = FORMAT_DATE_DAY_MONTH,
-                    )
+                    ),
                 )
             }
         }
@@ Expand Down @@