Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3e861792 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #7191 from thundernest/inject_ClientIdAppName 

Fix `ValidateServerSettings` Koin definition (`clientIdAppName`)
parents 2c8e0b86 89530e5b

feature/account/server/validation/src/main/kotlin/app/k9mail/feature/account/server/validation/ServerValidationModule.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ import com.fsck.k9.mail.store.imap.ImapServerSettingsValidator 
import com.fsck.k9.mail.store.pop3.Pop3ServerSettingsValidator

import com.fsck.k9.mail.store.pop3.Pop3ServerSettingsValidator

import com.fsck.k9.mail.transport.smtp.SmtpServerSettingsValidator

import com.fsck.k9.mail.transport.smtp.SmtpServerSettingsValidator

import org.koin.androidx.viewmodel.dsl.viewModel

import org.koin.androidx.viewmodel.dsl.viewModel

import org.koin.core.qualifier.named

import org.koin.dsl.module

import org.koin.dsl.module





val featureAccountServerValidationModule = module {

val featureAccountServerValidationModule = module {
@@ -28,7 +29,7 @@ val featureAccountServerValidationModule = module { 
            imapValidator = ImapServerSettingsValidator(

            imapValidator = ImapServerSettingsValidator(

                trustedSocketFactory = get(),

                trustedSocketFactory = get(),

                oAuth2TokenProviderFactory = get(),

                oAuth2TokenProviderFactory = get(),

                clientIdAppName = "null", // TODO get real value

                clientIdAppName = get(named("ClientIdAppName")),

            ),

            ),

            pop3Validator = Pop3ServerSettingsValidator(

            pop3Validator = Pop3ServerSettingsValidator(

                trustedSocketFactory = get(),

                trustedSocketFactory = get(),

feature/account/server/validation/src/test/kotlin/app/k9mail/feature/account/server/validation/ServerValidationModuleKtTest.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ import org.junit.runner.RunWith 
import org.koin.android.ext.koin.androidContext

import org.koin.android.ext.koin.androidContext

import org.koin.core.annotation.KoinExperimentalAPI

import org.koin.core.annotation.KoinExperimentalAPI

import org.koin.core.module.Module

import org.koin.core.module.Module

import org.koin.core.qualifier.named

import org.koin.dsl.koinApplication

import org.koin.dsl.koinApplication

import org.koin.dsl.module

import org.koin.dsl.module

import org.koin.test.KoinTest

import org.koin.test.KoinTest
@@ -42,6 +43,7 @@ class ServerValidationModuleKtTest : KoinTest { 
            }

            }

        }

        }

        single<LocalKeyStore> { Mockito.mock() }

        single<LocalKeyStore> { Mockito.mock() }

        single(named("ClientIdAppName")) { "App Name" }

    }

    }





    @OptIn(KoinExperimentalAPI::class)

    @OptIn(KoinExperimentalAPI::class)