Directly upload Attachment when adding it to the Draft

Infomaniak · Apr 30, 2024 · b6a6d35 · b6a6d35
1 parent a686d09
commit b6a6d35
Showing 1 changed file with 10 additions and 6 deletions.
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
@@ -468,13 +468,15 @@ class NewMessageFragment : Fragment() {
 
     private fun observeAttachments() = with(newMessageViewModel) {
 
-        var shouldRegisterToImportedAttachments = true
+        var isFirstTime = true
 
         attachmentsLiveData.observe(viewLifecycleOwner) { attachments ->
 
-            if (shouldRegisterToImportedAttachments) {
-                shouldRegisterToImportedAttachments = false
+            if (isFirstTime) {
+                isFirstTime = false
                 observeImportAttachments()
+            } else {
+                saveDraft()
             }
 
             val shouldTransition = attachmentAdapter.itemCount != 0 && attachments.isEmpty()
@@ -521,8 +523,12 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    override fun onStop() = with(newMessageViewModel) {
+    override fun onStop() {
+        saveDraft()
+        super.onStop()
+    }
 
+    private fun saveDraft() = with(newMessageViewModel) {
         executeDraftActionWhenStopping(
             action = if (shouldSendInsteadOfSave) DraftAction.SEND else DraftAction.SAVE,
             isFinishing = requireActivity().isFinishing,
@@ -531,8 +537,6 @@ class NewMessageFragment : Fragment() {
             uiBodyValue = binding.bodyTextField.text.toString(),
             startWorkerCallback = ::startWorker,
         )
-
-        super.onStop()
     }
 
     private fun startWorker() {