mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added KPN mail

This commit is contained in:
M66B 2019-09-12 19:35:42 +02:00
parent 1913fb58c5
commit 9d3ee14fc7
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import java.net.URL;
import java.net.UnknownHostException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@ -55,6 +56,7 @@ import java.util.concurrent.Future;
public class EmailProvider {
public String name;
public List<String> domain;
public String link;
public int order;
public String type;
@ -103,6 +105,9 @@ public class EmailProvider {
provider.name = xml.getAttributeValue(null, "name");
provider.order = xml.getAttributeIntValue(null, "order", Integer.MAX_VALUE);
provider.keepalive = xml.getAttributeIntValue(null, "keepalive", 0);
String domain = xml.getAttributeValue(null, "domain");
if (domain != null)
provider.domain = Arrays.asList(domain.split(","));
provider.link = xml.getAttributeValue(null, "link");
provider.type = xml.getAttributeValue(null, "type");
String user = xml.getAttributeValue(null, "user");
@ -150,16 +155,22 @@ public class EmailProvider {
}
static EmailProvider fromDomain(Context context, String domain, Discover discover) throws IOException {
EmailProvider autoconfig = _fromDomain(context, domain, discover);
List<EmailProvider> providers = loadProfiles(context);
for (EmailProvider provider : providers)
if (provider.domain != null && provider.domain.contains(domain.toLowerCase())) {
Log.i("Provider from domain=" + domain);
return provider;
}
EmailProvider autoconfig = _fromDomain(context, domain.toLowerCase(), discover);
// Always prefer built-in profiles
// - ISPDB is not always correct
// - documentation links
List<EmailProvider> providers = loadProfiles(context);
for (EmailProvider provider : providers)
if (provider.imap.host.equals(autoconfig.imap.host) ||
provider.smtp.host.equals(autoconfig.smtp.host)) {
Log.i("Replacing autoconfig by profile " + provider.name);
Log.i("Replacing auto config by profile=" + provider.name);
return provider;
}

13
app/src/main/res/xml/providers.xml
View File

@ -307,4 +307,17 @@
port="465"
starttls="false" />
</provider>
<provider
name="KPN mail"
domain="kpnmail.nl,kpnplanet.nl,planet.nl,wxs.nl,hetnet.nl,freeler.nl,snelnet.net,on.nl,onsbrabantnet.nl,onsmail.nl,onsnet.nu,onsneteindhoven.nl,onsnetnuenen.nl"
link="https://www.kpn.com/service/internet/e-mail/instellen-laptop-pc.htm">
<imap
host="imap.kpnmail.nl"
port="993"
starttls="false" />
<smtp
host="smtp.kpnmail.nl"
port="587"
starttls="true" />
</provider>
</providers>