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

Allow placeholders in Autoconfig domain elements

Browse source
This commit is contained in:
cketti 2023-11-09 23:46:25 +01:00
parent 6b976f5f6b
commit 513bd2cec9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
feature/autodiscovery/autoconfig/src/main/kotlin/app/k9mail/autodiscovery/autoconfig/RealAutoconfigParser.kt
View file

@ -112,7 +112,7 @@ private class ClientConfigParser(
if (eventType == XmlPullParser.START_TAG) {
when (pullParser.name) {
"domain" -> {
val domain = readText()
val domain = readText().replaceVariables()
if (domain.isValidHostname()) {
domainFound = true
}

1
feature/autodiscovery/autoconfig/src/test/kotlin/app/k9mail/autodiscovery/autoconfig/RealAutoconfigParserTest.kt
View file

@ -112,6 +112,7 @@ class RealAutoconfigParserTest {
@Test
fun `replace variables`() {
val inputStream = minimalConfig.withModifications {
element("domain").text("%EMAILDOMAIN%")
element("incomingServer > hostname").text("%EMAILLOCALPART%.domain.example")
element("outgoingServer > hostname").text("%EMAILLOCALPART%.outgoing.domain.example")
element("outgoingServer > username").text("%EMAILDOMAIN%")