chore(message-reader): remove html-cleaner feature project dependency

Author: rafaeltonholo

cli/html-cleaner-cli/build.gradle.kts

@@ -9,8 +9,6 @@ application {
 }
 
 dependencies {
-    implementation(projects.core.featureflag)
-    implementation(projects.feature.mail.message.reader.api)
     implementation(projects.library.htmlCleaner)
 
     implementation(libs.clikt)

cli/html-cleaner-cli/src/main/kotlin/app/k9mail/cli/html/cleaner/Main.kt

@@ -12,8 +12,6 @@ import com.github.ajalt.clikt.parameters.types.enum
 import com.github.ajalt.clikt.parameters.types.file
 import com.github.ajalt.clikt.parameters.types.inputStream
 import java.io.File
-import net.thunderbird.core.featureflag.FeatureFlagResult
-import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import okio.buffer
 import okio.sink
 import okio.source
@@ -45,21 +43,16 @@ class HtmlCleaner : CliktCommand() {
     }
 
     private fun cleanHtml(html: String): String {
+        val defaultNamespaceClassName = if (app == App.THUNDERBIRD) {
+            "net_thunderbird_android"
+        } else {
+            "com_fsck_k9"
+        }
         val htmlProcessor = HtmlProcessor(
-            featureFlagProvider = { FeatureFlagResult.Enabled },
-            cssClassNameProvider = object : CssClassNameProvider {
-                override val defaultNamespaceClassName: String
-                    get() = if (app == App.THUNDERBIRD) {
-                        "net_thunderbird_android"
-                    } else {
-                        "com_fsck_k9"
-                    }
-                override val rootClassName: String = "${defaultNamespaceClassName}__message-viewer"
-                override val mainContentClassName: String = "${defaultNamespaceClassName}__main-content"
-                override val plainTextMessagePreClassName: String =
-                    "${defaultNamespaceClassName}__plain-text-message-pre"
-                override val signatureClassName: String = "${defaultNamespaceClassName}__signature"
-            },
+            customClasses = setOf(
+                "${defaultNamespaceClassName}__message-viewer",
+                "${defaultNamespaceClassName}__main-content",
+            ),
             htmlHeadProvider = object : HtmlHeadProvider {
                 override val headHtml = """<meta name="viewport" content="width=device-width"/>"""
             },

legacy/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt

@@ -3,6 +3,7 @@ package com.fsck.k9.message.html
 import app.k9mail.html.cleaner.HtmlProcessor
 import net.thunderbird.core.common.mail.html.HtmlSettings
 import net.thunderbird.core.featureflag.FeatureFlagProvider
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 
 class HtmlProcessorFactory(
@@ -12,6 +13,12 @@ class HtmlProcessorFactory(
 ) {
     fun create(settings: HtmlSettings): HtmlProcessor {
         val displayHtml = displayHtmlFactory.create(settings)
-        return HtmlProcessor(featureFlagProvider, cssClassNameProvider, displayHtml)
+        val customClasses =
+            if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles).isEnabled()) {
+                setOf(cssClassNameProvider.rootClassName, cssClassNameProvider.mainContentClassName)
+            } else {
+                emptySet()
+            }
+        return HtmlProcessor(customClasses, displayHtml)
     }
 }

library/html-cleaner/build.gradle.kts

@@ -5,6 +5,4 @@ plugins {
 
 dependencies {
     implementation(libs.jsoup)
-    implementation(projects.core.featureflag)
-    implementation(projects.feature.mail.message.reader.api)
 }

library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlProcessor.kt

@@ -1,13 +1,9 @@
 package app.k9mail.html.cleaner
 
-import net.thunderbird.core.featureflag.FeatureFlagProvider
-import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
-import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import org.jsoup.nodes.Document
 
 class HtmlProcessor(
-    private val featureFlagProvider: FeatureFlagProvider,
-    private val cssClassNameProvider: CssClassNameProvider,
+    private val customClasses: Set<String>,
     private val htmlHeadProvider: HtmlHeadProvider,
 ) {
     private val htmlSanitizer = HtmlSanitizer()
@@ -32,10 +28,10 @@ class HtmlProcessor(
     }
 
     private fun Document.addCustomClasses() = apply {
-        if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageViewerCssStyles).isEnabled()) {
-            body()
-                .addClass(cssClassNameProvider.rootClassName)
-                .addClass(cssClassNameProvider.mainContentClassName)
+        if (customClasses.isNotEmpty()) {
+            body().apply {
+                customClasses.forEach(::addClass)
+            }
         }
     }
 }