Merge pull request #7348 from thunderbird/autoconfig_allow_placeholde…

…r_in_domain_element Allow placeholders in Autoconfig `domain` elements
thunderbird · Nov 10, 2023 · 8f06c24 · 8f06c24
2 parents 6b976f5 + 513bd2c
commit 8f06c24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...ry/autoconfig/src/main/kotlin/app/k9mail/autodiscovery/autoconfig/RealAutoconfigParser.kt b/...ry/autoconfig/src/main/kotlin/app/k9mail/autodiscovery/autoconfig/RealAutoconfigParser.kt
@@ -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
                         }

diff --git a/...utoconfig/src/test/kotlin/app/k9mail/autodiscovery/autoconfig/RealAutoconfigParserTest.kt b/...utoconfig/src/test/kotlin/app/k9mail/autodiscovery/autoconfig/RealAutoconfigParserTest.kt
@@ -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%")