Apply the rest of the code review changes

Author: LunarX

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

@@ -339,7 +339,7 @@ class NewMessageFragment : Fragment() {
 
     private fun initEditorUi() = with(binding) {
         editor.apply {
-            enableAlgorithmicDarkening(true)
+            enableAlgorithmicDarkening(isEnabled = true)
             if (context.isNightModeEnabled()) editor.addCss(context.readRawResource(R.raw.custom_dark_mode))
 
             addCss(context.readRawResource(R.raw.style))
@@ -599,13 +599,12 @@ class NewMessageFragment : Fragment() {
     }
 
     override fun onStop() {
-        /**
-         * When the Activity is being stopped, we save the Draft.
-         * We then need the up-to-date subject & body values.
-         */
+        // When the Activity is being stopped, we save the Draft. To do this, we need to know the subject and body values but
+        // these values might not be accessible anymore by then. We store them right now before potentially loosing access to them
+        // in case we need to save the Draft when they're inaccessible.
         val subject = binding.subjectTextField.text.toString()
         binding.editor.exportHtml { html ->
-            newMessageViewModel.saveBodyAndSubject(subject, html)
+            newMessageViewModel.storeBodyAndSubject(subject, html)
         }
 
         super.onStop()

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

@@ -295,7 +295,7 @@ class NewMessageViewModel @Inject constructor(
         if (remoteBody.isEmpty()) return
 
         val (body, signature, quote) = when (draft.mimeType) {
-            Utils.TEXT_PLAIN -> Triple(BodyContentPayload(remoteBody, BodyContentType.TEXT_PLAIN_WITHOUT_HTML), null, null)
+            Utils.TEXT_PLAIN -> BodyData(BodyContentPayload(remoteBody, BodyContentType.TEXT_PLAIN_WITHOUT_HTML), null, null)
             Utils.TEXT_HTML -> splitSignatureAndQuoteFromHtml(remoteBody)
             else -> error("Cannot load an email which is not of type text/plain or text/html")
         }
@@ -307,7 +307,7 @@ class NewMessageViewModel @Inject constructor(
         }
     }
 
-    private fun splitSignatureAndQuoteFromHtml(draftBody: String): Triple<BodyContentPayload, String?, String?> {
+    private fun splitSignatureAndQuoteFromHtml(draftBody: String): BodyData {
 
         fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
             return getElementsByClass(divClassName).firstOrNull()?.let {
@@ -335,7 +335,7 @@ class NewMessageViewModel @Inject constructor(
             doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
-        return Triple(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
+        return BodyData(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
     }
 
     private fun populateWithExternalMailDataIfNeeded(draft: Draft, intent: Intent) {
@@ -767,7 +767,7 @@ class NewMessageViewModel @Inject constructor(
         }.onFailure(Sentry::captureException)
     }
 
-    fun saveBodyAndSubject(subject: String, html: String) {
+    fun storeBodyAndSubject(subject: String, html: String) {
         globalCoroutineScope.launch(ioDispatcher) {
             _subjectAndBodyChannel.send(SubjectAndBodyData(subject, html, channelExpirationIdTarget))
         }
@@ -853,7 +853,7 @@ class NewMessageViewModel @Inject constructor(
 
         val signature = uiSignatureLiveData.value
         val quote = uiQuoteLiveData.value
-        body = assembleWholeBody(uiBodyValue, signature, quote)
+        body = uiBodyValue + (signature ?: "") + (quote ?: "")
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -915,9 +915,6 @@ class NewMessageViewModel @Inject constructor(
         }
     }
 
-    private fun assembleWholeBody(body: String, signature: String?, quote: String?): String =
-        body + (signature ?: "") + (quote ?: "")
-
     private fun isSnapshotTheSame(subjectValue: String?, uiBodyValue: String): Boolean {
         return snapshot?.let { draftSnapshot ->
             draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() &&
@@ -1012,6 +1009,8 @@ class NewMessageViewModel @Inject constructor(
 
     private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
 
+    private data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
+
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
         private const val ATTACHMENTS_MAX_SIZE = 25L * 1_024L * 1_024L // 25 MB