Better write some code according to code review

Author: LunarX

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

@@ -22,9 +22,15 @@ package com.infomaniak.mail.ui.newMessage
  * @param type The type of representation of [content]. Each type will lead to different processing of the content.
  */
 data class BodyContentPayload(val content: String, val type: BodyContentType) {
+
     companion object {
-        fun emptyBody(): BodyContentPayload = BodyContentPayload("", BodyContentType.TEXT_PLAIN_WITHOUT_HTML)
+        fun emptyBody() = BodyContentPayload("", BodyContentType.TEXT_PLAIN_WITHOUT_HTML)
     }
 }
 
-enum class BodyContentType { HTML_SANITIZED, HTML_UNSANITIZED, TEXT_PLAIN_WITH_HTML, TEXT_PLAIN_WITHOUT_HTML }
+enum class BodyContentType {
+    HTML_SANITIZED,
+    HTML_UNSANITIZED,
+    TEXT_PLAIN_WITH_HTML,
+    TEXT_PLAIN_WITHOUT_HTML,
+}

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

@@ -56,16 +56,15 @@ class EditorContentManager @Inject constructor() {
     private fun String.sanitize(): String = HtmlSanitizer.getInstance()
         .sanitize(Jsoup.parse(this))
         .apply { outputSettings().prettyPrint(false) }
-        .extractHtmlWithoutDocumentWrapping()
+        .getHtmlWithoutDocumentWrapping()
 
-    private fun Document.extractHtmlWithoutDocumentWrapping(): String {
+    private fun Document.getHtmlWithoutDocumentWrapping(): String {
         val html = root().firstElementChild() ?: return html()
         val nodeSize = html.childNodeSize()
         val elements = html.children()
-        val elementSize = elements.count()
 
         val canRemoveDocumentWrapping = nodeSize == 2
-                && elementSize == 2
+                && elements.count() == 2
                 && elements[0].tagName().uppercase() == "HEAD"
                 && elements[0].childNodeSize() == 0
                 && elements[1].tagName().uppercase() == "BODY"

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

@@ -85,7 +85,6 @@ class NewMessageAiManager @Inject constructor(
             fragment = fragment,
             freeReferences = {
                 _aiViewModel = null
-                _editorContentManager = null
                 valueAnimator?.cancel()
                 valueAnimator = null
             },

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

@@ -327,6 +327,18 @@ class NewMessageFragment : Fragment() {
             }
         })
 
+        initEditorUi()
+
+        setupSendButton()
+        externalsManager.setupExternalBanner()
+
+        scrim.setOnClickListener {
+            scrim.isClickable = false
+            aiManager.closeAiPrompt()
+        }
+    }
+
+    private fun initEditorUi() = with(binding) {
         editor.apply {
             enableAlgorithmicDarkening(true)
             if (context.isNightModeEnabled()) editor.addCss(context.readRawResource(R.raw.custom_dark_mode))
@@ -343,14 +355,6 @@ class NewMessageFragment : Fragment() {
                 .onEach { isVisible -> newMessagePlaceholder.isVisible = isVisible }
                 .launchIn(lifecycleScope)
         }
-
-        setupSendButton()
-        externalsManager.setupExternalBanner()
-
-        scrim.setOnClickListener {
-            scrim.isClickable = false
-            aiManager.closeAiPrompt()
-        }
     }
 
     private fun initializeDraft() = with(newMessageViewModel) {

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

@@ -123,8 +123,8 @@ class NewMessageViewModel @Inject constructor(
     // 3. When saving or sending the draft now, the channel still holds the previous body as it wasn't consumed.
     // channelExpirationIdTarget lets us identify and discard outdated messages, ensuring the correct message is processed.
     private var channelExpirationIdTarget = 0
-    private val _subjectAndBodyChannel: Channel<Triple<String, String, Int>> = Channel(capacity = CONFLATED)
-    private val subjectAndBodyChannel: ReceiveChannel<Triple<String, String, Int>> = _subjectAndBodyChannel
+    private val _subjectAndBodyChannel: Channel<SubjectAndBodyData> = Channel(capacity = CONFLATED)
+    private val subjectAndBodyChannel: ReceiveChannel<SubjectAndBodyData> = _subjectAndBodyChannel
     private var subjectAndBodyJob: Job? = null
 
     var isAutoCompletionOpened = false
@@ -769,7 +769,7 @@ class NewMessageViewModel @Inject constructor(
 
     fun saveBodyAndSubject(subject: String, html: String) {
         globalCoroutineScope.launch(ioDispatcher) {
-            _subjectAndBodyChannel.send(Triple(subject, html, channelExpirationIdTarget))
+            _subjectAndBodyChannel.send(SubjectAndBodyData(subject, html, channelExpirationIdTarget))
         }
     }
 
@@ -783,6 +783,7 @@ class NewMessageViewModel @Inject constructor(
             val subject: String
             val body: String
             while (true) {
+                // receive() is a blocking call as long as it has no data
                 val (receivedSubject, receivedBody, expirationId) = subjectAndBodyChannel.receive()
                 if (expirationId == channelExpirationIdTarget) {
                     subject = receivedSubject
@@ -1009,6 +1010,8 @@ class NewMessageViewModel @Inject constructor(
         val attachmentsLocalUuids: Set<String>,
     )
 
+    private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
+
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
         private const val ATTACHMENTS_MAX_SIZE = 25L * 1_024L * 1_024L // 25 MB