Merge pull request #7157 from thundernest/add_account_server_config_module (a789e3a6) · Commits · e / os / Mail

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/AuthenticationType.kt→feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationType.kt

+1 −1

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.setup.domain.entity
		package app.k9mail.feature.account.common.domain.entity

		import com.fsck.k9.mail.AuthType
		import kotlinx.collections.immutable.toImmutableList

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/ConnectionSecurity.kt→feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurity.kt

+9 −10

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.setup.domain.entity
		package app.k9mail.feature.account.common.domain.entity

		import app.k9mail.feature.account.common.domain.entity.MailConnectionSecurity
		import app.k9mail.feature.account.setup.domain.entity.ConnectionSecurity.None
		import app.k9mail.feature.account.setup.domain.entity.ConnectionSecurity.StartTLS
		import app.k9mail.feature.account.setup.domain.entity.ConnectionSecurity.TLS
		import app.k9mail.feature.account.common.domain.entity.ConnectionSecurity.None
		import app.k9mail.feature.account.common.domain.entity.ConnectionSecurity.StartTLS
		import app.k9mail.feature.account.common.domain.entity.ConnectionSecurity.TLS
		import kotlinx.collections.immutable.toImmutableList

		enum class ConnectionSecurity {
		@@ -18,7 +17,7 @@ enum class ConnectionSecurity {
		}
		}

		internal fun ConnectionSecurity.toMailConnectionSecurity(): MailConnectionSecurity {
		fun ConnectionSecurity.toMailConnectionSecurity(): MailConnectionSecurity {
		return when (this) {
		None -> MailConnectionSecurity.NONE
		StartTLS -> MailConnectionSecurity.STARTTLS_REQUIRED
		@@ -26,7 +25,7 @@ internal fun ConnectionSecurity.toMailConnectionSecurity(): MailConnectionSecuri
		}
		}

		internal fun MailConnectionSecurity.toConnectionSecurity(): ConnectionSecurity {
		fun MailConnectionSecurity.toConnectionSecurity(): ConnectionSecurity {
		return when (this) {
		MailConnectionSecurity.NONE -> None
		MailConnectionSecurity.STARTTLS_REQUIRED -> StartTLS
		@@ -35,7 +34,7 @@ internal fun MailConnectionSecurity.toConnectionSecurity(): ConnectionSecurity {
		}

		@Suppress("MagicNumber")
		internal fun ConnectionSecurity.toSmtpDefaultPort(): Long {
		fun ConnectionSecurity.toSmtpDefaultPort(): Long {
		return when (this) {
		None -> 587
		StartTLS -> 587
		@@ -44,7 +43,7 @@ internal fun ConnectionSecurity.toSmtpDefaultPort(): Long {
		}

		@Suppress("MagicNumber")
		internal fun ConnectionSecurity.toImapDefaultPort(): Long {
		fun ConnectionSecurity.toImapDefaultPort(): Long {
		return when (this) {
		None -> 143
		StartTLS -> 143
		@@ -53,7 +52,7 @@ internal fun ConnectionSecurity.toImapDefaultPort(): Long {
		}

		@Suppress("MagicNumber")
		internal fun ConnectionSecurity.toPop3DefaultPort(): Long {
		fun ConnectionSecurity.toPop3DefaultPort(): Long {
		return when (this) {
		None -> 110
		StartTLS -> 110

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/IncomingProtocolType.kt→feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolType.kt

+2 −2

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.setup.domain.entity
		package app.k9mail.feature.account.common.domain.entity

		import kotlinx.collections.immutable.toImmutableList

		@@ -21,7 +21,7 @@ enum class IncomingProtocolType(
		}
		}

		internal fun IncomingProtocolType.toDefaultPort(connectionSecurity: ConnectionSecurity): Long {
		fun IncomingProtocolType.toDefaultPort(connectionSecurity: ConnectionSecurity): Long {
		return when (this) {
		IncomingProtocolType.IMAP -> connectionSecurity.toImapDefaultPort()
		IncomingProtocolType.POP3 -> connectionSecurity.toPop3DefaultPort()

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/OutgoingProtocolType.kt→feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolType.kt

+3 −3

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.setup.domain.entity
		package app.k9mail.feature.account.common.domain.entity

		import kotlinx.collections.immutable.toImmutableList

		internal enum class OutgoingProtocolType(
		enum class OutgoingProtocolType(
		val defaultName: String,
		val defaultConnectionSecurity: ConnectionSecurity,
		) {
		@@ -16,7 +16,7 @@ internal enum class OutgoingProtocolType(
		}
		}

		internal fun OutgoingProtocolType.toDefaultPort(connectionSecurity: ConnectionSecurity): Long {
		fun OutgoingProtocolType.toDefaultPort(connectionSecurity: ConnectionSecurity): Long {
		return when (this) {
		OutgoingProtocolType.SMTP -> connectionSecurity.toSmtpDefaultPort()
		}

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/input/BooleanInputField.kt→feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/input/BooleanInputField.kt

+1 −1

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.setup.domain.input
		package app.k9mail.feature.account.common.domain.input

		import app.k9mail.core.common.domain.usecase.validation.ValidationError
		import app.k9mail.core.common.domain.usecase.validation.ValidationResult