Skip to content

uplift(beta): chore(feature-flags): enable new message reader CSS styles and mark legacy code for cleanup for release build (#10499) #10504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coreycb merged 1 commit into from
Feb 9, 2026
+14 −2
Merged

uplift(beta): chore(feature-flags): enable new message reader CSS styles and mark legacy code for cleanup for release build (#10499) #10504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...et/thunderbird/android/feature/mail/message/reader/api/css/DefaultCssClassNameProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ class DefaultCssClassNameProvider(
if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles).isEnabled()) {
"${defaultNamespaceClassName}__plain-text-message-pre"
} else {
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
EmailTextToHtml.K9MAIL_CSS_CLASS
}
override val signatureClassName: String =
if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles).isEnabled()) {
"${defaultNamespaceClassName}__signature"
} else {
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
"k9mail-signature"
}
}
1 change: 1 addition & 0 deletions app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = true),
FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = true),
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
FeatureFlag(MessageListFeatureFlags.EnableMessageListNewState, enabled = true),
),
Expand Down
4 changes: 3 additions & 1 deletion app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = false),
FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = true),
FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = false),
// TODO(#10498): Clean up all the legacy code that is wrapped with UseNewMessageReaderCssStyles
// once it no longer required
FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
FeatureFlag(MessageListFeatureFlags.EnableMessageListNewState, enabled = false),
),
)
Expand Down
1 change: 1 addition & 0 deletions app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = true),
FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = true),
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
FeatureFlag(MessageListFeatureFlags.EnableMessageListNewState, enabled = true),
),
Expand Down
4 changes: 3 additions & 1 deletion ...hunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = false),
FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = true),
FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = false),
// TODO(#10498): Clean up all the legacy code that is wrapped with UseNewMessageReaderCssStyles
// once it no longer required
FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
FeatureFlag(MessageListFeatureFlags.EnableMessageListNewState, enabled = false),
),
)
Expand Down
1 change: 1 addition & 0 deletions ...nMain/kotlin/net/thunderbird/feature/mail/message/reader/api/MessageReaderFeatureFlags.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ package net.thunderbird.feature.mail.message.reader.api
import net.thunderbird.core.featureflag.FeatureFlagKey

object MessageReaderFeatureFlags {
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
val UseNewMessageReaderCssStyles = FeatureFlagKey("use_new_message_reader_css_styles")
}
1 change: 1 addition & 0 deletions ...lin/net/thunderbird/feature/mail/message/reader/impl/css/DefaultGlobalCssStyleProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ internal class DefaultGlobalCssStyleProvider private constructor(
}
}

// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
internal class LegacyGlobalCssStyleProvider(useDarkMode: Boolean) : GlobalCssStyleProvider {
@Language("HTML")
override val style: String = if (useDarkMode) {
Expand Down
1 change: 1 addition & 0 deletions ...lin/net/thunderbird/feature/mail/message/reader/impl/inject/FeatureMessageReaderModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ val featureMessageReaderModule = module {
cssVariableNameProvider = get(),
)
} else {
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
LegacyGlobalCssStyleProvider.Factory()
}
}
Expand Down
1 change: 1 addition & 0 deletions legacy/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class HtmlProcessorFactory(
if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles).isEnabled()) {
setOf(cssClassNameProvider.rootClassName, cssClassNameProvider.mainContentClassName)
} else {
// TODO(#10498): Remove when UseNewMessageReaderCssStyles is no longer required
emptySet()
}
return HtmlProcessor(customClasses, displayHtml)
Expand Down