feat: Add signature and quotes in RichHtmlEditorWebview

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

@@ -24,7 +24,11 @@ package com.infomaniak.mail.ui.newMessage
 data class BodyContentPayload(val content: String, val type: BodyContentType) {
 
     companion object {
-        fun emptyBody() = BodyContentPayload(content = "", type = BodyContentType.TEXT_PLAIN_WITHOUT_HTML)
+        fun emptyBody() =
+            BodyContentPayload(
+                content = "<br id=lineBreakAtBeginningOfSignature>",
+                type = BodyContentType.HTML_SANITIZED
+            )
     }
 }
 

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

@@ -83,6 +83,7 @@ import com.infomaniak.mail.ui.newMessage.NewMessageRecipientFieldsManager.FieldT
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.ContactUtils.arrangeMergedContacts
 import com.infomaniak.mail.utils.DraftInitManager
+import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -130,7 +131,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
 import javax.inject.Inject
@@ -171,8 +171,6 @@ class NewMessageViewModel @Inject constructor(
     val ccLiveData = MutableLiveData<UiRecipients>()
     val bccLiveData = MutableLiveData<UiRecipients>()
     val attachmentsLiveData = MutableLiveData<List<Attachment>>()
-    val uiSignatureLiveData = MutableLiveData<String?>()
-    val uiQuoteLiveData = MutableLiveData<String?>()
     inline val allRecipients get() = toLiveData.valueOrEmpty() + ccLiveData.valueOrEmpty() + bccLiveData.valueOrEmpty()
     //endregion
 
@@ -222,6 +220,9 @@ class NewMessageViewModel @Inject constructor(
     private val _isShimmering = MutableStateFlow(true)
     val isShimmering: StateFlow<Boolean> = _isShimmering
 
+    private val _areQuotesVisible = MutableStateFlow(false)
+    val areQuotesVisible: StateFlow<Boolean> = _areQuotesVisible
+
     //region Check mailbox existence
     private val exitSignal: CompletableJob = Job()
 
@@ -328,10 +329,8 @@ class NewMessageViewModel @Inject constructor(
             markAsRead(currentMailbox(), realm)
 
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
-            it.saveSnapshot(initialBody.content)
             it.initLiveData(signatures)
             _isShimmering.emit(false)
-
             initResult.postValue(InitResult(it, signatures))
         }
 
@@ -344,11 +343,14 @@ class NewMessageViewModel @Inject constructor(
             if (draft.identityId.isNullOrBlank()) {
                 draft.identityId = currentMailbox().getDefaultSignatureWithFallback().id.toString()
             }
-            splitSignatureAndQuoteFromBody(draft)
+            val contentType =
+                if (draft.mimeType == Utils.TEXT_PLAIN) BodyContentType.TEXT_PLAIN_WITH_HTML else BodyContentType.HTML_SANITIZED
+            initialBody = BodyContentPayload(draft.body, contentType)
+            return draft
         }
     }
 
-    private suspend fun getNewDraft(signatures: List<Signature>, intent: Intent, realm: Realm): Draft? = Draft().apply {
+    private suspend fun getNewDraft(signatures: List<Signature>, intent: Intent, realm: Realm): Draft = Draft().apply {
 
         var previousMessage: Message? = null
 
@@ -424,56 +426,6 @@ class NewMessageViewModel @Inject constructor(
         savedStateHandle[NewMessageActivityArgs::draftResource.name] = draftResource
     }
 
-    private fun splitSignatureAndQuoteFromBody(draft: Draft) {
-        val remoteBody = draft.body
-        if (remoteBody.isEmpty()) return
-
-        val (body, signature, quote) = when (draft.mimeType) {
-            Utils.TEXT_PLAIN -> BodyData(
-                body = BodyContentPayload(remoteBody, BodyContentType.TEXT_PLAIN_WITHOUT_HTML),
-                signature = null,
-                quote = null
-            )
-            Utils.TEXT_HTML -> splitSignatureAndQuoteFromHtml(remoteBody)
-            else -> error("Cannot load an email which is not of type text/plain or text/html")
-        }
-
-        initialBody = body
-        initialSignature = signature
-        initialQuote = quote
-    }
-
-    private fun splitSignatureAndQuoteFromHtml(draftBody: String): BodyData {
-
-        fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
-            return getElementsByClass(divClassName).firstOrNull()?.let {
-                it.remove()
-                val first = body().html()
-                val second = if (it.html().isBlank()) null else it.outerHtml()
-                first to second
-            } ?: (defaultValue to null)
-        }
-
-        fun String.lastIndexOfOrMax(string: String): Int {
-            val index = lastIndexOf(string)
-            return if (index == -1) Int.MAX_VALUE else index
-        }
-
-        val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
-
-        val (bodyWithQuote, signature) = doc.split(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
-
-        val replyPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val forwardPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        val (body, quote) = if (replyPosition < forwardPosition) {
-            doc.split(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
-        } else {
-            doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
-        }
-
-        return BodyData(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
-    }
-
     private fun populateWithExternalMailDataIfNeeded(draft: Draft, intent: Intent) {
         when (intent.action) {
             Intent.ACTION_SEND -> handleSingleSendIntent(draft, intent)
@@ -548,10 +500,28 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
-        editorBodyInitializer.postValue(initialBody)
+        var finalBodyContent = initialBody.content
+        val signatureHtml = draftSignature?.takeIf { !it.isDummy }?.content
+        val wrappedSignature = signatureHtml?.let { signatureUtils.encapsulateSignatureContentWithInfomaniakClass(it) }
 
-        uiSignatureLiveData.postValue(initialSignature)
-        uiQuoteLiveData.postValue(initialQuote)
+        if (isNewMessage && wrappedSignature != null) {
+            finalBodyContent += wrappedSignature
+        }
+
+        if (isNewMessage && !initialQuote.isNullOrEmpty()) {
+            _areQuotesVisible.emit(true)
+            finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
+        }
+
+        val normalizedBody = normalizeHtml(finalBodyContent)
+        saveSnapshot(normalizedBody)
+
+        editorBodyInitializer.postValue(
+            BodyContentPayload(
+                content = normalizedBody,
+                type = BodyContentType.HTML_SANITIZED
+            )
+        )
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
             otherRecipientsFieldsAreEmpty.postValue(false)
@@ -561,6 +531,21 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
+    fun bodyHasPlaceholder(bodyHtml: String): Boolean {
+        val body = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).body()
+        return !body.hasText()
+    }
+
+    fun changeQuotesVisibility(areVisible: Boolean) {
+        _areQuotesVisible.value = areVisible
+    }
+
+    private fun normalizeHtml(html: String): String {
+        val doc = jsoupParseWithLog(html)
+        doc.outputSettings().prettyPrint(false)
+        return doc.body().html()
+    }
+
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
 
         @Suppress("UNUSED_PARAMETER")
@@ -839,14 +824,6 @@ class NewMessageViewModel @Inject constructor(
         if (cc.isEmpty() && bcc.isEmpty()) otherRecipientsFieldsAreEmpty.value = true
     }
 
-    fun updateBodySignature(signature: Signature) {
-        uiSignatureLiveData.value = if (signature.isDummy) {
-            null
-        } else {
-            signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
-        }
-    }
-
     fun uploadAttachmentsToServer(uiAttachments: List<Attachment>) = viewModelScope.launch(ioDispatcher) {
         val localUuid = draftLocalUuid ?: return@launch
         val realm = mailboxContentRealm()
@@ -963,8 +940,7 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-
-        body = uiBodyValue + (uiSignatureLiveData.value ?: "") + (uiQuoteLiveData.value ?: "")
+        body = sanitizeBody(uiBodyValue)
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -980,11 +956,28 @@ class NewMessageViewModel @Inject constructor(
 
         // Only if `!isFinishing`, because if we are finishing, well… We're out of here so we don't care about all of that.
         if (!isFinishing) {
-            copyFromRealm().saveSnapshot(uiBodyValue)
+            val normalizedBody = normalizeHtml(body)
+            copyFromRealm().saveSnapshot(normalizedBody)
             isNewMessage = false
         }
     }
 
+    private fun sanitizeBody(html: String): String {
+        val doc = jsoupParseWithLog(html)
+        // If the user deleted the quotes text, remove the quotes div so the button to show quotes doesn't show.
+        val quotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html)
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        val hasQuotes = quotes.isNotEmpty()
+        if (hasQuotes && !quotes.hasText()) {
+            doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
+        }
+
+        // Don't save the draft or send the mail with quotes style display none.
+        if (hasQuotes) quotes.attr("style", "display: block")
+
+        return doc.html()
+    }
+
     private fun Draft.updateDraftAttachmentsWithLiveData(uiAttachments: List<Attachment>, step: String) {
 
         /**
@@ -1030,7 +1023,7 @@ class NewMessageViewModel @Inject constructor(
                     draftSnapshot.cc == ccLiveData.valueOrEmpty().toSet() &&
                     draftSnapshot.bcc == bccLiveData.valueOrEmpty().toSet() &&
                     draftSnapshot.subject == subjectValue &&
-                    draftSnapshot.uiBody == uiBodyValue &&
+                    sanitizeBody(draftSnapshot.uiBody) == sanitizeBody(uiBodyValue) &&
                     draftSnapshot.isEncrypted == isEncryptionActivated.value &&
                     draftSnapshot.encryptionPassword == encryptionPassword.value &&
                     draftSnapshot.attachmentsLocalUuids == attachmentsLiveData.valueOrEmpty()

app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt

@@ -27,6 +27,7 @@ import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.readRawResource
+import kotlinx.serialization.json.JsonPrimitive
 import org.jsoup.nodes.Element
 import org.jsoup.nodes.Node
 import org.jsoup.nodes.TextNode
@@ -210,6 +211,11 @@ class HtmlFormatter(private val html: String) {
             }
         }
 
+        fun String.escapeForJS(): String {
+            if (isNullOrEmpty()) return this
+            return JsonPrimitive(this).toString().removeSurrounding("\"")
+        }
+
         fun Context.getCustomDarkMode(): String = loadCss(R.raw.custom_dark_mode)
 
         fun Context.getImproveRenderingStyle(): String = loadCss(R.raw.improve_rendering)
@@ -219,6 +225,11 @@ class HtmlFormatter(private val html: String) {
             listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary)),
         )
 
+        fun Context.getCustomEditorStyle(): String = loadCss(
+            R.raw.editor_style,
+            listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary))
+        )
+
         fun Context.getSignatureMarginStyle(): String = loadCss(R.raw.signature_margins)
 
         fun Context.getPrintMailStyle(): String = loadCss(R.raw.print_email)
@@ -228,6 +239,14 @@ class HtmlFormatter(private val html: String) {
             listOf("MESSAGE_SELECTOR" to "#$KMAIL_MESSAGE_ID")
         )
 
+        fun Context.getToggleQuotesButtonVisibilityScript(): String = loadScript(
+            R.raw.show_quotes_script
+        )
+
+        fun Context.getReplaceSignatureScript(): String = loadScript(
+            R.raw.replace_signature_script
+        )
+
         fun Context.getFixStyleScript(): String {
             return loadScript(R.raw.fix_email_style)
         }

app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt

@@ -63,6 +63,10 @@ object MessageBodyUtils {
         "[name=\"quote\"]", // GMX
     )
 
+    fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
+        return """<div class="$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME" spellcheck="false">$quotes<br></div>""".trimIndent()
+    }
+
     suspend fun splitContentAndQuote(body: Body): SplitBody {
 
         val bodyContent = body.value

app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt

@@ -19,6 +19,7 @@ package com.infomaniak.mail.utils
 
 import android.content.Context
 import com.infomaniak.mail.R
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.extensions.loadCss
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -31,10 +32,16 @@ class SignatureUtils @Inject constructor(appContext: Context) {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         val verticalMarginsCss = signatureMargins
         val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
-        return """<div class="${MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME}" style="$verticalMarginAttributes">$signatureContent</div>"""
+        if (verticalMarginAttributes.isNullOrEmpty()) return signatureContent
+
+        return """
+            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">
+            $signatureContent
+            </div>
+        """.trimIndent()
     }
 
-    private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String {
-        return Regex("""\{(.*)\}""").find(verticalMarginsCss)!!.groupValues[1]
+    private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String? {
+        return Regex("""\{(.*)\}""").find(verticalMarginsCss)?.groupValues[1]
     }
 }

app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt

@@ -31,7 +31,6 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getImproveRenderingStyl
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getJsBridgeScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getSignatureMarginStyle
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.loadCss
 
@@ -40,7 +39,6 @@ class WebViewUtils(context: Context) {
     private val customDarkMode by lazy { context.getCustomDarkMode() }
     private val improveRenderingStyle by lazy { context.getImproveRenderingStyle() }
     private val customStyle by lazy { context.getCustomStyle() }
-    private val signatureVerticalMargin by lazy { context.getSignatureMarginStyle() }
     private val printMailStyle by lazy { context.getPrintMailStyle() }
 
     private val resizeScript by lazy { context.getResizeScript() }
@@ -65,15 +63,6 @@ class WebViewUtils(context: Context) {
         return@with inject()
     }
 
-    fun processSignatureHtmlForDisplay(
-        html: String,
-        isDisplayedInDarkMode: Boolean,
-    ): String = with(HtmlFormatter(html)) {
-        addCommonDisplayContent(isDisplayedInDarkMode)
-        registerCss(signatureVerticalMargin)
-        return@with inject()
-    }
-
     private fun HtmlFormatter.addCommonDisplayContent(isDisplayedInDarkMode: Boolean) {
         if (isDisplayedInDarkMode) registerCss(customDarkMode, DARK_BACKGROUND_STYLE_ID)
         registerCss(improveRenderingStyle)
@@ -134,16 +123,14 @@ class WebViewUtils(context: Context) {
         private fun WebSettings.setupCommonWebViewSettings() {
             @SuppressLint("SetJavaScriptEnabled")
             javaScriptEnabled = true
-
             loadWithOverviewMode = true
-            useWideViewPort = true
-
             cacheMode = LOAD_CACHE_ELSE_NETWORK
         }
 
         fun WebSettings.setupThreadWebViewSettings() {
             setupCommonWebViewSettings()
 
+            useWideViewPort = true
             setSupportZoom(true)
             builtInZoomControls = true
             displayZoomControls = false