wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change AutoDiscoveryServerSettingsView to also handle IP addresses

Browse source
This commit is contained in:
Wolf-Martell Montwé 2023-06-15 17:45:59 +02:00
parent ef6d35c44c
commit 4d2712eeca
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
3 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/common/src/main/kotlin/app/k9mail/core/common/net/Hostname.kt
View file

@ -11,3 +11,5 @@ value class Hostname(val value: String) {
}
fun String.toHostname() = Hostname(this)
fun Hostname.isIpAddress(): Boolean = HostNameUtils.isLegalIPAddress(value) != null

38
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryServerSettingsView.kt
View file

@ -17,6 +17,9 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import app.k9mail.autodiscovery.api.ConnectionSecurity
import app.k9mail.core.common.net.Hostname
import app.k9mail.core.common.net.isIpAddress
import app.k9mail.core.common.net.toHostname
import app.k9mail.core.ui.compose.designsystem.atom.Icon
import app.k9mail.core.ui.compose.designsystem.atom.text.TextBody1
import app.k9mail.core.ui.compose.designsystem.atom.text.TextBody2
@ -24,16 +27,15 @@ import app.k9mail.core.ui.compose.theme.Icons
import app.k9mail.core.ui.compose.theme.MainTheme
import app.k9mail.core.ui.compose.theme.PreviewWithThemes
import app.k9mail.feature.account.setup.ui.autoconfig.toResourceString
import app.k9mail.feature.account.setup.ui.common.toResourceString
@Composable
internal fun AutoDiscoveryServerSettingsView(
protocolName: String,
serverHostname: String,
serverHostname: Hostname,
serverPort: Int,
connectionSecurity: ConnectionSecurity,
modifier: Modifier = Modifier,
username: String? = null,
username: String = "",
isIncoming: Boolean = true,
) {
val resources = LocalContext.current.resources
@ -58,9 +60,13 @@ internal fun AutoDiscoveryServerSettingsView(
text = buildAnnotatedString {
append("Server")
append(": ")
append(serverHostname.substringBefore(".") + ".")
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
append(serverHostname.substringAfter("."))
if (serverHostname.isIpAddress()) {
append(serverHostname.value)
} else {
append(serverHostname.value.substringBefore(".") + ".")
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
append(serverHostname.value.substringAfter("."))
}
}
append(":$serverPort")
},
@ -117,7 +123,7 @@ internal fun AutoDiscoveryServerSettingsViewPreview() {
PreviewWithThemes {
AutoDiscoveryServerSettingsView(
protocolName = "IMAP",
serverHostname = "imap.example.com",
serverHostname = "imap.example.com".toHostname(),
serverPort = 993,
connectionSecurity = ConnectionSecurity.TLS,
)
@ -130,7 +136,7 @@ internal fun AutoDiscoveryServerSettingsViewOutgoingPreview() {
PreviewWithThemes {
AutoDiscoveryServerSettingsView(
protocolName = "IMAP",
serverHostname = "imap.example.com",
serverHostname = "imap.example.com".toHostname(),
serverPort = 993,
connectionSecurity = ConnectionSecurity.TLS,
isIncoming = false,
@ -144,7 +150,21 @@ internal fun AutoDiscoveryServerSettingsViewWithUserPreview() {
PreviewWithThemes {
AutoDiscoveryServerSettingsView(
protocolName = "IMAP",
serverHostname = "imap.example.com",
serverHostname = "imap.example.com".toHostname(),
serverPort = 993,
connectionSecurity = ConnectionSecurity.TLS,
username = "username",
)
}
}
@Preview
@Composable
internal fun AutoDiscoveryServerSettingsViewWithIpAddressPreview() {
PreviewWithThemes {
AutoDiscoveryServerSettingsView(
protocolName = "IMAP",
serverHostname = "127.0.0.1".toHostname(),
serverPort = 993,
connectionSecurity = ConnectionSecurity.TLS,
username = "username",

6
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusBodyView.kt
View file

@ -51,9 +51,10 @@ internal fun AutoDiscoveryStatusBodyView(
Spacer(modifier = Modifier.height(MainTheme.sizes.smaller))
AutoDiscoveryServerSettingsView(
protocolName = "IMAP",
serverHostname = incomingServerSettings.hostname.value,
serverHostname = incomingServerSettings.hostname,
serverPort = incomingServerSettings.port.value,
connectionSecurity = incomingServerSettings.connectionSecurity,
username = incomingServerSettings.username,
isIncoming = true,
modifier = Modifier.fillMaxWidth(),
)
@ -64,9 +65,10 @@ internal fun AutoDiscoveryStatusBodyView(
Spacer(modifier = Modifier.height(MainTheme.sizes.smaller))
AutoDiscoveryServerSettingsView(
protocolName = "SMTP",
serverHostname = outgoingServerSettings.hostname.value,
serverHostname = outgoingServerSettings.hostname,
serverPort = outgoingServerSettings.port.value,
connectionSecurity = outgoingServerSettings.connectionSecurity,
username = outgoingServerSettings.username,
isIncoming = false,
modifier = Modifier.fillMaxWidth(),
)