refactor: Clean getBackNavigationResult() related code

Infomaniak · Feb 3, 2025 · 9a5573d · 9a5573d
1 parent c62f707
commit 9a5573d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -168,7 +168,7 @@ class ThreadFragment : Fragment() {
         observeThreadOpening()
         observeAutoAdvance()
 
-        observeScheduleSend()
+        setupBackActionHandler()
 
         observeReportDisplayProblemResult()
 
@@ -571,10 +571,7 @@ class ThreadFragment : Fragment() {
         mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner, ::tryToAutoAdvance)
     }
 
-    private fun observeScheduleSend() {
-        getBackNavigationResult(SCHEDULE_SEND_RESULT) { selectedScheduleEpoch: Long ->
-            mainViewModel.rescheduleDraft(Date(selectedScheduleEpoch))
-        }
+    private fun setupBackActionHandler() {
 
         fun navigateBackToBottomSheet() {
             safeNavigate(
@@ -600,6 +597,10 @@ class ThreadFragment : Fragment() {
                 onCancel = ::navigateBackToBottomSheet,
             )
         }
+
+        getBackNavigationResult(SCHEDULE_SEND_RESULT) { selectedScheduleEpoch: Long ->
+            mainViewModel.rescheduleDraft(Date(selectedScheduleEpoch))
+        }
     }
 
     private fun displayThreadView() = with(binding) {

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -186,13 +186,12 @@ class NewMessageFragment : Fragment() {
         observeRecipients()
         observeAttachments()
         observeImportAttachmentsResult()
-        observeOpenAttachment()
         observeBodyLoader()
         observeUiSignature()
         observeUiQuote()
         observeShimmering()
 
-        observeScheduleSend()
+        setupBackActionHandler()
 
         with(editorManager) {
             observeEditorFormatActions()
@@ -224,11 +223,7 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun observeScheduleSend() {
-        getBackNavigationResult(SCHEDULE_SEND_RESULT) { selectedScheduleEpoch: Long ->
-            newMessageViewModel.setScheduleDate(Date(selectedScheduleEpoch))
-            tryToSendEmail(scheduled = true)
-        }
+    private fun setupBackActionHandler() {
 
         fun navigateBackToBottomSheet() {
             safeNavigate(
@@ -255,6 +250,13 @@ class NewMessageFragment : Fragment() {
                 onCancel = ::navigateBackToBottomSheet,
             )
         }
+
+        getBackNavigationResult(SCHEDULE_SEND_RESULT) { selectedScheduleEpoch: Long ->
+            newMessageViewModel.setScheduleDate(Date(selectedScheduleEpoch))
+            tryToSendEmail(scheduled = true)
+        }
+
+        getBackNavigationResult(AttachmentExtensions.DOWNLOAD_ATTACHMENT_RESULT, ::startActivity)
     }
 
     private fun setShimmerVisibility(isShimmering: Boolean) = with(binding) {
@@ -667,10 +669,6 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun observeOpenAttachment() {
-        getBackNavigationResult(AttachmentExtensions.DOWNLOAD_ATTACHMENT_RESULT, ::startActivity)
-    }
-
     private fun observeImportAttachmentsResult() = with(newMessageViewModel) {
         importAttachmentsResult.observe(viewLifecycleOwner) { result ->
             if (result == ImportationResult.ATTACHMENTS_TOO_BIG) showSnackbar(R.string.attachmentFileLimitReached)