Also measure and log splitContentAndQuotes()

Author: LunarX

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

@@ -27,18 +27,21 @@ object JsoupParserUtil {
     private const val BYTE_TO_MEGABYTE_DIVIDER: Float = 1024f * 1024f
 
     fun jsoupParseWithLog(value: String): Document {
-        return measureMemoryUsage(SENTRY_LOG_TAG, actionName = "parsing") {
+        return measureAndLogMemoryUsage(SENTRY_LOG_TAG, actionName = "parsing") {
             Jsoup.parse(value)
         }
     }
 
     fun jsoupParseBodyFragmentWithLog(value: String): Document {
-        return measureMemoryUsage(SENTRY_LOG_TAG, actionName = "parsing body fragment") {
+        return measureAndLogMemoryUsage(SENTRY_LOG_TAG, actionName = "parsing body fragment") {
             Jsoup.parseBodyFragment(value)
         }
     }
-
-    fun <R> measureMemoryUsage(tag: String, actionName: String, block: () -> R): R {
+    
+    /**
+     * Measures and logs to sentry the used and available RAM of the JVM
+     */
+    fun <R> measureAndLogMemoryUsage(tag: String, actionName: String, block: () -> R): R {
         val (usedMemoryBefore, maxMemoryBefore) = getMemoryUsage()
         SentryLog.i(tag, "Before $actionName, used / available: $usedMemoryBefore / $maxMemoryBefore MB")
 

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

@@ -21,8 +21,9 @@ import android.content.Context
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
-import com.infomaniak.mail.utils.PrintHeaderUtils.createPrintHeader
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
+import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
+import com.infomaniak.mail.utils.PrintHeaderUtils.createPrintHeader
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.CoroutineScope
@@ -67,7 +68,13 @@ object MessageBodyUtils {
             timeout = QUOTE_DETECTION_TIMEOUT,
             defaultValue = SplitBody(bodyContent),
             block = {
-                val (content, quotes) = splitContentAndQuotes(htmlDocument = jsoupParseWithLog(bodyContent))
+                // Do not nest jsoupParseWithLog and measureAndLogMemoryUsage so logs are independent from one another
+                val htmlDocument = jsoupParseWithLog(bodyContent)
+                val (content, quotes) = measureAndLogMemoryUsage(
+                    tag = "Split signature and quote memory usage",
+                    actionName = "splitting",
+                ) { splitContentAndQuotes(htmlDocument = htmlDocument) }
+
                 if (quotes.isEmpty() || quotes.all { it.isBlank() }) SplitBody(bodyContent) else SplitBody(content, bodyContent)
             },
             onTimeout = {