Replace unnecessary isSanitized boolean with two different enum types

Author: LunarX

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

@@ -21,15 +21,13 @@ package com.infomaniak.mail.ui.newMessage
 /**
  * @param content The string representation of the body in either html or plain text format.
  * @param type The type of representation of [content]. Each type will lead to different processing of the content.
- * @param isSanitized Is only required and cannot be omitted when [type] is [BodyContentType.HTML]. This describes whether or not
- * the HTML can skip sanitization when we know it's already been sanitized earlier.
  */
-data class BodyContentPayload(val content: String, val type: BodyContentType, val isSanitized: Boolean? = null) {
+data class BodyContentPayload(val content: String, val type: BodyContentType) {
     companion object {
         fun emptyBody(): BodyContentPayload {
             return BodyContentPayload("", BodyContentType.TEXT_PLAIN_WITHOUT_HTML)
         }
     }
 }
 
-enum class BodyContentType { HTML, 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

@@ -30,16 +30,14 @@ class EditorContentManager @Inject constructor() {
 
     fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload) = with(editor) {
         when (bodyContentPayload.type) {
-            BodyContentType.HTML -> setHtml(bodyContentPayload.content, bodyContentPayload.isSanitized!!)
+            BodyContentType.HTML_SANITIZED -> setSanitizedHtml(bodyContentPayload.content)
+            BodyContentType.HTML_UNSANITIZED -> setUnsanitizedHtml(bodyContentPayload.content)
             BodyContentType.TEXT_PLAIN_WITH_HTML -> setPlainTextAndInterpretHtml(bodyContentPayload.content)
             BodyContentType.TEXT_PLAIN_WITHOUT_HTML -> setPlainTextAndEscapeHtml(bodyContentPayload.content)
         }
     }
 
-    private fun RichHtmlEditorWebView.setHtml(html: String, isSanitized: Boolean) {
-        val sanitizedHtml = if (isSanitized) html else html.sanitize()
-        setSanitizedHtml(sanitizedHtml)
-    }
+    private fun RichHtmlEditorWebView.setUnsanitizedHtml(html: String) = setSanitizedHtml(html.sanitize())
 
     private fun RichHtmlEditorWebView.setPlainTextAndInterpretHtml(text: String) {
         setSanitizedHtml(text.replaceNewLines().sanitize())

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

@@ -98,10 +98,7 @@ class NewMessageAiManager @Inject constructor(
     fun observeAiOutput() = with(binding) {
         aiViewModel.aiOutputToInsert.observe(viewLifecycleOwner) { (subject, content) ->
             subject?.let(subjectTextField::setText)
-            editorContentManager.setContent(
-                editor,
-                BodyContentPayload(content, BodyContentType.TEXT_PLAIN_WITH_HTML, isSanitized = false)
-            )
+            editorContentManager.setContent(editor, BodyContentPayload(content, BodyContentType.TEXT_PLAIN_WITH_HTML))
         }
     }
 

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

@@ -245,7 +245,7 @@ class NewMessageFragment : Fragment() {
 
     override fun onDestroyView() {
         binding.editor.exportHtml { html ->
-            newMessageViewModel.editorBodyLoader.postValue(BodyContentPayload(html, BodyContentType.HTML, isSanitized = true))
+            newMessageViewModel.editorBodyLoader.postValue(BodyContentPayload(html, BodyContentType.HTML_SANITIZED))
         }
 
         addressListPopupWindow = null

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

@@ -323,7 +323,7 @@ class NewMessageViewModel @Inject constructor(
             doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
-        return Triple(BodyContentPayload(body, BodyContentType.HTML, isSanitized = false), signature, quote)
+        return Triple(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
     }
 
     private fun populateWithExternalMailDataIfNeeded(draft: Draft, intent: Intent) {