Replace some non-injected loggers

bitfireAT · Jul 24, 2024 · cbd9a55 · cbd9a55
1 parent 4e49626
commit cbd9a55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/log/LogFileHandler.kt b/app/src/main/kotlin/at/bitfire/davdroid/log/LogFileHandler.kt
@@ -34,6 +34,7 @@ import javax.inject.Inject
  */
 class LogFileHandler @Inject constructor(
     @ApplicationContext val context: Context,
+    private val logger: Logger,
     private val notificationRegistry: NotificationRegistry
 ): Handler(), Closeable {
 
@@ -71,7 +72,6 @@ class LogFileHandler @Inject constructor(
     }
 
     private var fileHandler: FileHandler? = null
-    private val logger = Logger.getGlobal()
     private val notificationManager = NotificationManagerCompat.from(context)
 
     private val logFile = getDebugLogFile(context)

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/repository/AccountRepository.kt b/app/src/main/kotlin/at/bitfire/davdroid/repository/AccountRepository.kt
@@ -51,13 +51,12 @@ class AccountRepository @Inject constructor(
     private val accountSettingsFactory: AccountSettings.Factory,
     @ApplicationContext val context: Context,
     private val homeSetRepository: DavHomeSetRepository,
+    private val logger: Logger,
     private val settingsManager: SettingsManager,
     private val serviceRepository: DavServiceRepository,
     private val collectionRepository: DavCollectionRepository
 ) {
 
-    private val logger = Logger.getGlobal()
-
     private val accountType = context.getString(R.string.account_type)
     private val accountManager = AccountManager.get(context)
 

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt b/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt
@@ -40,6 +40,7 @@ import java.util.logging.Logger
 class AccountSettings @AssistedInject constructor(
     @Assisted accountOrAddressBookAccount: Account,
     @ApplicationContext val context: Context,
+    private val logger: Logger,
     private val migrationsFactory: AccountSettingsMigrations.Factory,
     private val settingsManager: SettingsManager
 ) {
@@ -135,8 +136,6 @@ class AccountSettings @AssistedInject constructor(
     }
 
 
-    private val logger: Logger = Logger.getGlobal()
-
     val accountManager: AccountManager = AccountManager.get(context)
     val account: Account = when (accountOrAddressBookAccount.type) {
             context.getString(R.string.account_type_address_book) -> {