Save Draft in Activity onStop instead of Fragment one

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

@@ -29,12 +29,14 @@ import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.MatomoMail.trackDestination
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.AppSettings
+import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.databinding.ActivityNewMessageBinding
 import com.infomaniak.mail.ui.BaseActivity
 import com.infomaniak.mail.ui.LaunchActivity
 import com.infomaniak.mail.ui.main.SnackbarManager
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.SentryDebug
+import com.infomaniak.mail.workers.DraftsActionsWorker
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -52,6 +54,9 @@ class NewMessageActivity : BaseActivity() {
     @Inject
     lateinit var snackbarManager: SnackbarManager
 
+    @Inject
+    lateinit var draftsActionsWorkerScheduler: DraftsActionsWorker.Scheduler
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
@@ -109,4 +114,25 @@ class NewMessageActivity : BaseActivity() {
         SentryDebug.addNavigationBreadcrumb(destination.displayName, arguments)
         trackDestination(destination)
     }
+
+
+    override fun onStop() {
+        saveDraft()
+        super.onStop()
+    }
+
+    fun saveDraft() = with(newMessageViewModel) {
+        executeDraftActionWhenStopping(
+            action = if (shouldSendInsteadOfSave) Draft.DraftAction.SEND else Draft.DraftAction.SAVE,
+            isFinishing = isFinishing,
+            isTaskRoot = isTaskRoot,
+            subjectValue = subjectTextField,
+            uiBodyValue = bodyTextField,
+            startWorkerCallback = ::startWorker,
+        )
+    }
+
+    private fun startWorker() {
+        draftsActionsWorkerScheduler.scheduleWork(newMessageViewModel.draftLocalUuid())
+    }
 }

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

@@ -39,6 +39,7 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.Group
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
@@ -72,7 +73,6 @@ import com.infomaniak.mail.utils.WebViewUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.destroyAndClearHistory
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.*
-import com.infomaniak.mail.workers.DraftsActionsWorker
 import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.Sentry
 import io.sentry.SentryLevel
@@ -124,9 +124,6 @@ class NewMessageFragment : Fragment() {
     @Inject
     lateinit var localSettings: LocalSettings
 
-    @Inject
-    lateinit var draftsActionsWorkerScheduler: DraftsActionsWorker.Scheduler
-
     @Inject
     lateinit var informationDialog: InformationAlertDialog
 
@@ -161,6 +158,9 @@ class NewMessageFragment : Fragment() {
 
         handleOnBackPressed()
 
+        doAfterSubjectChange()
+        doAfterBodyChange()
+
         observeInitResult()
         observeFromData()
         observeRecipients()
@@ -415,6 +415,18 @@ class NewMessageFragment : Fragment() {
         binding.fromMailAddress.text = formattedExpeditor
     }
 
+    private fun doAfterSubjectChange() {
+        binding.subjectTextField.doAfterTextChanged { editable ->
+            editable?.toString()?.let { newMessageViewModel.subjectTextField = it }
+        }
+    }
+
+    private fun doAfterBodyChange() {
+        binding.bodyTextField.doAfterTextChanged { editable ->
+            editable?.toString()?.let { newMessageViewModel.bodyTextField = it }
+        }
+    }
+
     private fun observeInitResult() {
         newMessageViewModel.initResult.observe(viewLifecycleOwner) { (draft, signatures) ->
             hideLoader()
@@ -478,7 +490,8 @@ class NewMessageFragment : Fragment() {
             } else if (attachments.count() > attachmentAdapter.itemCount) {
                 // If we are adding Attachments, directly save the Draft, so the Attachments' upload starts now.
                 // TODO: Only save Attachments, and not the whole Draft.
-                saveDraft()
+                // TODO: When not using `saveDraft()` anymore, make it private again.
+                newMessageActivity.saveDraft()
             }
 
             // When removing an Attachment, both counts will be the same, because the Adapter is already notified.
@@ -527,26 +540,6 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    override fun onStop() {
-        saveDraft()
-        super.onStop()
-    }
-
-    private fun saveDraft() = with(newMessageViewModel) {
-        executeDraftActionWhenStopping(
-            action = if (shouldSendInsteadOfSave) DraftAction.SEND else DraftAction.SAVE,
-            isFinishing = requireActivity().isFinishing,
-            isTaskRoot = requireActivity().isTaskRoot,
-            subjectValue = binding.subjectTextField.text.toString(),
-            uiBodyValue = binding.bodyTextField.text.toString(),
-            startWorkerCallback = ::startWorker,
-        )
-    }
-
-    private fun startWorker() {
-        draftsActionsWorkerScheduler.scheduleWork(newMessageViewModel.draftLocalUuid())
-    }
-
     private fun onDeleteAttachment(position: Int) {
         trackAttachmentActionsEvent("delete")
         newMessageViewModel.deleteAttachment(position)

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

@@ -106,6 +106,9 @@ class NewMessageViewModel @Inject constructor(
     val uiQuoteLiveData = MutableLiveData<String?>()
     //endregion
 
+    var subjectTextField = ""
+    var bodyTextField = ""
+
     var isAutoCompletionOpened = false
     var isEditorExpanded = false
     var isExternalBannerManuallyClosed = false