mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 12:12:15 +02:00
Code

Use constructor injection for "clientIdAppName"

Browse Source
This commit is contained in:
cketti 2023-06-23 14:33:34 +02:00
parent 8143ae53ec
commit 6d53e41114
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt
View File

@ -2,7 +2,6 @@ package com.fsck.k9.backends
import android.content.Context
import com.fsck.k9.Account
import com.fsck.k9.BuildConfig
import com.fsck.k9.backend.BackendFactory
import com.fsck.k9.backend.api.Backend
import com.fsck.k9.backend.imap.ImapBackend
@ -27,6 +26,7 @@ class ImapBackendFactory(
private val backendStorageFactory: K9BackendStorageFactory,
private val trustedSocketFactory: TrustedSocketFactory,
private val context: Context,
private val clientIdAppName: String,
) : BackendFactory {
override fun createBackend(account: Account): Backend {
val accountName = account.displayName
@ -71,7 +71,7 @@ class ImapBackendFactory(
override fun useCompression() = account.useCompression
override fun clientIdAppName(): String? {
return BuildConfig.CLIENT_ID_APP_NAME.takeIf { account.isSendClientIdEnabled }
return clientIdAppName.takeIf { account.isSendClientIdEnabled }
}
}
}

4
app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt
View File

@ -2,10 +2,12 @@ package com.fsck.k9.backends
import app.k9mail.dev.developmentBackends
import app.k9mail.dev.developmentModuleAdditions
import com.fsck.k9.BuildConfig
import com.fsck.k9.backend.BackendManager
import com.fsck.k9.backend.imap.BackendIdleRefreshManager
import com.fsck.k9.backend.imap.SystemAlarmManager
import com.fsck.k9.mail.store.imap.IdleRefreshManager
import org.koin.core.qualifier.named
import org.koin.dsl.module
val backendsModule = module {
@ -25,11 +27,13 @@ val backendsModule = module {
backendStorageFactory = get(),
trustedSocketFactory = get(),
context = get(),
clientIdAppName = get(named("ClientIdAppName")),
)
}
single<SystemAlarmManager> { AndroidAlarmManager(context = get(), alarmManager = get()) }
single<IdleRefreshManager> { BackendIdleRefreshManager(alarmManager = get()) }
single { Pop3BackendFactory(get(), get()) }
single(named("ClientIdAppName")) { BuildConfig.CLIENT_ID_APP_NAME }
developmentModuleAdditions()
}