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

Change ProviderAutoconfigUrlProvider to match Thunderbird's behavior

Browse source 
See <https://searchfox.org/comm-central/rev/f1c212acd8e3c3c2d1f5e2d442bb66e1407243b5/mail/components/accountcreation/FetchConfig.jsm#94-154>
This commit is contained in:
cketti 2023-04-27 17:05:42 +02:00
parent c585e05bc2
commit 686bba8b9c
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
feature/autodiscovery/autoconfig/src/main/kotlin/app/k9mail/autodiscovery/autoconfig/ProviderAutoconfigUrlProvider.kt
View file

@ -9,29 +9,33 @@ class ProviderAutoconfigUrlProvider : AutoconfigUrlProvider {
requireNotNull(domain) { "Couldn't extract domain from email address: $email" }
return listOf(
createProviderUrl(domain, email),
createDomainUrl(scheme = "https", domain),
createDomainUrl(scheme = "http", domain),
createProviderUrl(domain, email, useHttps = true),
createDomainUrl(domain, email, useHttps = true),
createProviderUrl(domain, email, useHttps = false),
createDomainUrl(domain, email, useHttps = false),
)
}
private fun createProviderUrl(domain: String?, email: String): HttpUrl {
private fun createProviderUrl(domain: String, email: String, useHttps: Boolean): HttpUrl {
// https://autoconfig.{domain}/mail/config-v1.1.xml?emailaddress={email}
// http://autoconfig.{domain}/mail/config-v1.1.xml?emailaddress={email}
return HttpUrl.Builder()
.scheme("https")
.scheme(if (useHttps) "https" else "http")
.host("autoconfig.$domain")
.addEncodedPathSegments("mail/config-v1.1.xml")
.addQueryParameter("emailaddress", email)
.build()
}
private fun createDomainUrl(scheme: String, domain: String): HttpUrl {
// https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml
// http://{domain}/.well-known/autoconfig/mail/config-v1.1.xml
private fun createDomainUrl(domain: String, email: String, useHttps: Boolean): HttpUrl {
// https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={email}
// http://{domain}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={email}
return HttpUrl.Builder()
.scheme(scheme)
.scheme(if (useHttps) "https" else "http")
.host(domain)
.addEncodedPathSegments(".well-known/autoconfig/mail/config-v1.1.xml")
.addQueryParameter("emailaddress", email)
.build()
}
}

5
feature/autodiscovery/autoconfig/src/test/kotlin/app/k9mail/autodiscovery/autoconfig/ProviderAutoconfigUrlProviderTest.kt
View file

@ -13,8 +13,9 @@ class ProviderAutoconfigUrlProviderTest {
assertThat(autoconfigUrls.map { it.toString() }).containsExactly(
"https://autoconfig.domain.example/mail/config-v1.1.xml?emailaddress=test%40domain.example",
"https://domain.example/.well-known/autoconfig/mail/config-v1.1.xml",
"http://domain.example/.well-known/autoconfig/mail/config-v1.1.xml",
"https://domain.example/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=test%40domain.example",
"http://autoconfig.domain.example/mail/config-v1.1.xml?emailaddress=test%40domain.example",
"http://domain.example/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=test%40domain.example",
)
}
}