Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-27 19:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Auto discovery has precendence over NS discovery

Browse Source
This commit is contained in:
M66B
2025-02-09 17:09:13 +01:00
parent 599f440554
commit afb22aa934
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@@ -442,8 +442,20 @@ public class EmailProvider implements Parcelable {
for (EmailProvider provider : providers)
if (provider.mx != null)
for (String mx : provider.mx)
if (record.response.matches(mx))
if (record.response.matches(mx)) {
DnsHelper.DnsRecord[] imap = DnsHelper.lookup(context, "_imap._tcp." + domain, "srv");
DnsHelper.DnsRecord[] imaps = DnsHelper.lookup(context, "_imaps._tcp." + domain, "srv");
DnsHelper.DnsRecord[] smtp = DnsHelper.lookup(context, "_submission._tcp." + domain, "srv");
DnsHelper.DnsRecord[] smtps = DnsHelper.lookup(context, "_submissions._tcp." + domain, "srv");
EntityLog.log(context, "NS provider=" + provider.name +
" imap=" + imap.length + "/" + imaps.length +
" smtp=" + smtp.length + "/" + smtps.length +
" domain=" + domain);
// There could be a name server for hosting only, so prefer rfc6186 discovery
if (imap.length + imaps.length > 0 && smtp.length + smtps.length > 0)
continue;
return Arrays.asList(provider);
}
} catch (Throwable ex) {
Log.w(ex);
}