feat: Add signature and quotes in RichHtmlEditorWebview

app/src/main/java/com/infomaniak/mail/MatomoMail.kt

@@ -148,6 +148,7 @@ object MatomoMail : Matomo {
         DeleteDraft("deleteDraft"),
         DeleteExecuted("deleteExecuted"),
         DeleteFromHistory("deleteFromHistory"),
+        ShowQuote("showQuote"),
         DeleteQuote("deleteQuote"),
         DeleteRecipient("deleteRecipient"),
         DeleteSearch("deleteSearch"),

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt

@@ -125,17 +125,27 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
             addAndEscapeTextLine("")
 
             addAlreadyEscapedBody(previousFullBody)
+            // We insert an unstyled empty line immediately after the quoted block. This is necessary because deleting styled
+            // content often leaves behind empty containers with residual formatting (borders, backgrounds). This plain line acts
+            // as a "clean exit", when the user deletes the quotes up to this point, the editor drops the quotes' inline styles
+            // completely, allowing the entire block to be removed in one go.
+            addAndEscapeTextLine("")
         }.outerHtml()
     }
 
     private fun assembleReplyHtmlFooter(messageReplyHeader: String, previousFullBody: String): String {
-        val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}" />"""
+        val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}"/>"""
         return parseAndWrapElementInNewDocument(replyRoot).apply {
             addAndEscapeTextLine("")
             addAndEscapeTextLine(messageReplyHeader, endWithBr = false)
             addReplyBlockQuote {
                 addAlreadyEscapedBody(previousFullBody)
             }
+            // We insert an unstyled empty line immediately after the quoted block. This is necessary because deleting styled
+            // content often leaves behind empty containers with residual formatting (borders, backgrounds). This plain line acts
+            // as a "clean exit", when the user deletes the quotes up to this point, the editor drops the quotes' inline styles
+            // completely, allowing the entire block to be removed in one go.
+            addAndEscapeTextLine("")
         }.outerHtml()
     }
 

app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt

@@ -0,0 +1,42 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.data.models.javascriptBridge
+
+import android.webkit.JavascriptInterface
+import com.infomaniak.core.sentry.SentryLog
+import org.json.JSONArray
+
+class EditorJavascriptBridge(
+    private val onInlineImagesDeleted: (List<String>) -> Unit,
+) {
+    @JavascriptInterface
+    fun onInlineImagesDeleted(cidJson: String) {
+        val jsonArray = runCatching {
+            JSONArray(cidJson)
+        }.onFailure {
+            SentryLog.e(TAG, "Failed to parse CIDs", it)
+        }.getOrNull() ?: return
+
+        val cids = (0 until jsonArray.length()).map { jsonArray.getString(it) }
+        onInlineImagesDeleted(cids)
+    }
+
+    companion object {
+        private const val TAG = "EditorJavascriptBridge"
+    }
+}

app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/MessageDisplayJavascriptBridge.kt

@@ -0,0 +1,59 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.data.models.javascriptBridge
+
+import android.webkit.JavascriptInterface
+import com.infomaniak.mail.utils.SentryDebug
+
+class MessageDisplayJavascriptBridge(
+    private val onWebViewFinishedLoading: () -> Unit,
+) {
+
+    @JavascriptInterface
+    fun reportOverScroll(clientWidth: Int, scrollWidth: Int, messageUid: String) {
+        SentryDebug.sendOverScrolledMessage(clientWidth, scrollWidth, messageUid)
+    }
+
+    @JavascriptInterface
+    fun reportError(
+        errorName: String,
+        errorMessage: String,
+        errorStack: String,
+        scriptFirstLine: String,
+        messageUid: String,
+    ) {
+        val correctErrorStack = fixStackTraceLineNumber(errorStack, scriptFirstLine)
+        SentryDebug.sendJavaScriptError(errorName, errorMessage, correctErrorStack, messageUid)
+    }
+
+    @JavascriptInterface
+    fun webviewFinishedLoading() {
+        onWebViewFinishedLoading()
+    }
+
+    private fun fixStackTraceLineNumber(errorStack: String, scriptFirstLine: String): String {
+        var correctErrorStack = errorStack
+        val matches = "about:blank:([0-9]+):".toRegex().findAll(correctErrorStack)
+        matches.forEach { match ->
+            val lineNumber = match.groupValues[1]
+            val newLineNumber = lineNumber.toInt() - scriptFirstLine.toInt() + 1
+            correctErrorStack = correctErrorStack.replace(match.groupValues[0], "about:blank:$newLineNumber:")
+        }
+        return correctErrorStack
+    }
+}

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt

@@ -65,6 +65,7 @@ import com.infomaniak.mail.databinding.ItemSuperCollapsedBlockBinding
 import com.infomaniak.mail.ui.main.thread.ThreadAdapter.ThreadAdapterViewHolder
 import com.infomaniak.mail.ui.main.thread.models.MessageUi
 import com.infomaniak.mail.ui.main.thread.models.MessageUi.UnsubscribeState
+import com.infomaniak.mail.ui.main.thread.webViewClient.MessageDisplayWebViewClient
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.HtmlFormatter
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -86,7 +87,7 @@ import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.formatSubject
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.indexOfFirstOrNull
-import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
+import com.infomaniak.mail.utils.extensions.initDisplayWebViewClientAndBridge
 import com.infomaniak.mail.utils.extensions.toDate
 import com.infomaniak.mail.utils.extensions.toggleChevron
 import io.sentry.Sentry
@@ -797,8 +798,8 @@ class ThreadAdapter(
         quoteButtonFrameLayout.isVisible = hasQuote
 
         initWebViewClientIfNeeded(
-            message,
-            threadAdapterCallbacks?.navigateToNewMessageActivity,
+            message = message,
+            navigateToNewMessageActivity = threadAdapterCallbacks?.navigateToNewMessageActivity,
             onPageFinished = { onExpandedMessageLoaded(message.uid) },
             onWebViewFinishedLoading = { threadAdapterCallbacks?.onBodyWebViewFinishedLoading?.invoke() },
         )
@@ -1122,8 +1123,8 @@ class ThreadAdapter(
             onAttachmentOptionsClicked = { onAttachmentOptionsClicked?.invoke(it) },
         )
 
-        private var _bodyWebViewClient: MessageWebViewClient? = null
-        private var _fullMessageWebViewClient: MessageWebViewClient? = null
+        private var _bodyWebViewClient: MessageDisplayWebViewClient? = null
+        private var _fullMessageWebViewClient: MessageDisplayWebViewClient? = null
         val bodyWebViewClient get() = _bodyWebViewClient!!
         val fullMessageWebViewClient get() = _fullMessageWebViewClient!!
 
@@ -1149,7 +1150,7 @@ class ThreadAdapter(
             }
 
             if (_bodyWebViewClient == null) {
-                _bodyWebViewClient = binding.bodyWebView.initWebViewClientAndBridge(
+                _bodyWebViewClient = binding.bodyWebView.initDisplayWebViewClientAndBridge(
                     attachments = message.attachments,
                     messageUid = message.uid,
                     shouldLoadDistantResources = shouldLoadDistantResources,
@@ -1158,7 +1159,7 @@ class ThreadAdapter(
                     onPageFinished = onPageFinished,
                     onWebViewFinishedLoading = onWebViewFinishedLoading,
                 )
-                _fullMessageWebViewClient = binding.fullMessageWebView.initWebViewClientAndBridge(
+                _fullMessageWebViewClient = binding.fullMessageWebView.initDisplayWebViewClientAndBridge(
                     attachments = message.attachments,
                     messageUid = message.uid,
                     shouldLoadDistantResources = shouldLoadDistantResources,

app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt

@@ -0,0 +1,37 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.thread.webViewClient
+
+import android.content.Context
+import android.webkit.WebView
+import com.infomaniak.mail.data.models.Attachment
+
+class EditorWebViewClient(
+    context: Context,
+    cidDictionary: Map<String, Attachment>,
+    shouldLoadDistantResources: Boolean,
+    private val onPageFinished: () -> Unit,
+) : MessageWebViewClient(
+    context,
+    cidDictionary,
+    shouldLoadDistantResources,
+) {
+    override fun onPageFinished(webView: WebView, url: String?) {
+        onPageFinished()
+    }
+}

app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt

@@ -0,0 +1,94 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.thread.webViewClient
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import com.infomaniak.core.ui.showToast
+import com.infomaniak.core.ui.view.toDp
+import com.infomaniak.lib.richhtmleditor.looselyEscapeAsStringLiteralForJs
+import com.infomaniak.mail.R
+import com.infomaniak.mail.data.models.Attachment
+import com.infomaniak.mail.utils.Utils.runCatchingRealm
+import com.infomaniak.mail.utils.WebViewVersionUtils
+import io.sentry.Sentry
+import io.sentry.SentryLevel
+
+class MessageDisplayWebViewClient(
+    private val context: Context,
+    cidDictionary: Map<String, Attachment>,
+    private val messageUid: String,
+    shouldLoadDistantResources: Boolean,
+    onBlockedResourcesDetected: () -> Unit,
+    private val navigateToNewMessageActivity: ((Uri) -> Unit)?,
+    private val onPageFinished: (() -> Unit)?,
+) : MessageWebViewClient(
+    context,
+    cidDictionary,
+    shouldLoadDistantResources,
+    onBlockedResourcesDetected,
+) {
+    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
+        request.url?.let { uri ->
+
+            if (uri.scheme == "mailto") {
+                navigateToNewMessageActivity?.invoke(uri)
+                return true
+            }
+
+            runCatching {
+                val intent = Intent(Intent.ACTION_VIEW, uri)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(intent)
+            }.onFailure {
+                context.showToast(R.string.startActivityCantHandleAction)
+            }
+        }
+        return true
+    }
+
+    override fun onPageFinished(webView: WebView, url: String?) {
+        runCatchingRealm {
+            val widthInDp = webView.width.toDp(webView)
+            if (widthInDp <= 0) {
+                val versionData = WebViewVersionUtils.getWebViewVersionData(context)
+
+                Sentry.captureMessage("Zero width webview detected onPageFinished which prevents message width's normalization") { scope ->
+                    scope.level = SentryLevel.WARNING
+                    scope.setExtra("width", webView.width.toString())
+                    scope.setExtra("measuredWidth", webView.measuredWidth.toString())
+                    scope.setExtra("height", webView.height.toString())
+                    scope.setExtra("measuredHeight", webView.measuredHeight.toString())
+                    scope.setTag(
+                        "webview version",
+                        "${versionData?.webViewPackageName}: ${versionData?.versionName} - ${versionData?.majorVersion}"
+                    )
+                    scope.setTag("visibility", webView.visibility.toString())
+                    scope.setTag("messageUid", messageUid)
+                    scope.setTag("shouldLoadDistantResources", shouldLoadDistantResources.toString())
+                }
+            }
+            val escapedMessageUid = looselyEscapeAsStringLiteralForJs(messageUid)
+            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, $escapedMessageUid)")
+            onPageFinished?.invoke()
+        }
+    }
+}