Merge pull request #9859 from thunderbird/revert-9816-fix-issue-9573

Revert "Decouple DebugLogConfigurator From Timber And Relocate to New Logger Infra"

Author: rafaeltonholo

core/logging/config/build.gradle.kts

@@ -1,17 +1,19 @@
-package net.thunderbird.core.logging.config
+package net.thunderbird.core.logging.legacy
 
 import net.thunderbird.core.logging.composite.CompositeLogSink
 import net.thunderbird.core.logging.file.FileLogSink
+import timber.log.Timber
+import timber.log.Timber.DebugTree
 
+// TODO: Implementation https://github.com/thunderbird/thunderbird-android/issues/9573
 class DebugLogConfigurator(
     private val syncDebugCompositeSink: CompositeLogSink,
     private val syncDebugFileLogSink: FileLogSink,
 ) {
     fun updateLoggingStatus(isDebugLoggingEnabled: Boolean) {
-        syncDebugCompositeSink.manager.removeAll()
+        Timber.uprootAll()
         if (isDebugLoggingEnabled) {
-            syncDebugCompositeSink.manager.add(syncDebugCompositeSink)
-            syncDebugCompositeSink.manager.add(syncDebugFileLogSink)
+            Timber.plant(DebugTree())
         }
     }
 

…e/logging/config/DebugLogConfigurator.kt …e/logging/legacy/DebugLogConfigurator.ktcore/logging/config/src/commonMain/kotlin/net/thunderbird/core/logging/config/DebugLogConfigurator.kt renamed to core/logging/impl-legacy/src/androidMain/kotlin/net/thunderbird/core/logging/legacy/DebugLogConfigurator.kt core/logging/config/src/commonMain/kotlin/net/thunderbird/core/logging/config/DebugLogConfigurator.kt renamed to core/logging/impl-legacy/src/androidMain/kotlin/net/thunderbird/core/logging/legacy/DebugLogConfigurator.kt

@@ -13,7 +13,6 @@ dependencies {
     api(projects.core.preference.impl)
     api(projects.core.android.logging)
     api(projects.core.logging.implFile)
-    api(projects.core.logging.config)
     api(projects.core.logging.implComposite)
     api(projects.core.android.network)
     api(projects.core.outcome)

legacy/core/build.gradle.kts

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import net.thunderbird.core.logging.config.DebugLogConfigurator
+import net.thunderbird.core.logging.legacy.DebugLogConfigurator
 import net.thunderbird.core.preference.GeneralSettings
 import net.thunderbird.core.preference.GeneralSettingsManager
 import net.thunderbird.core.preference.PreferenceChangePublisher

legacy/core/src/main/java/com/fsck/k9/preferences/DefaultGeneralSettingsManager.kt

@@ -3,7 +3,7 @@ package com.fsck.k9.preferences
 import com.fsck.k9.Preferences
 import kotlin.time.ExperimentalTime
 import net.thunderbird.core.android.account.LegacyAccountDtoManager
-import net.thunderbird.core.logging.config.DebugLogConfigurator
+import net.thunderbird.core.logging.legacy.DebugLogConfigurator
 import net.thunderbird.core.preference.DefaultPreferenceChangeBroker
 import net.thunderbird.core.preference.GeneralSettingsManager
 import net.thunderbird.core.preference.PreferenceChangeBroker

legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt

@@ -30,7 +30,7 @@ class ValidateLogger {
             .filterNot { it.hasNameMatching("ConsoleLogSink.android|ConsoleLogSinkTest.android".toRegex()) }
             .filterNot {
                 // Exclude legacy code that still uses Timber
-                it.hasNameMatching("LogFileWriter|FileLoggerTree|K9".toRegex())
+                it.hasNameMatching("LogFileWriter|FileLoggerTree|K9|DebugLogConfigurator".toRegex())
             }
             .assertFalse(
                 additionalMessage = "No class should use timber.log.Timber import, use net.thunderbird.core.logging.Logger instead."

quality/konsist/src/test/kotlin/net/thunderbird/quality/ValidateLogger.kt

@@ -153,7 +153,6 @@ include(
     ":core:configstore:impl-backend",
     ":core:featureflag",
     ":core:logging:api",
-    ":core:logging:config",
     ":core:logging:impl-composite",
     ":core:logging:impl-console",
     ":core:logging:impl-legacy",