mirror of https://github.com/M66B/FairEmail.git
Use regex to match provider domains
This commit is contained in:
parent
60848a43bf
commit
f42fa89fdc
|
@ -160,8 +160,10 @@ public class EmailProvider {
|
||||||
static EmailProvider fromDomain(Context context, String domain, Discover discover) throws IOException {
|
static EmailProvider fromDomain(Context context, String domain, Discover discover) throws IOException {
|
||||||
List<EmailProvider> providers = loadProfiles(context);
|
List<EmailProvider> providers = loadProfiles(context);
|
||||||
for (EmailProvider provider : providers)
|
for (EmailProvider provider : providers)
|
||||||
if (provider.domain != null && provider.domain.contains(domain.toLowerCase(Locale.ROOT))) {
|
if (provider.domain != null)
|
||||||
Log.i("Provider from domain=" + domain);
|
for (String d : provider.domain)
|
||||||
|
if (domain.toLowerCase(Locale.ROOT).matches(d)) {
|
||||||
|
Log.i("Provider from domain=" + domain + " (" + d + ")");
|
||||||
return provider;
|
return provider;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<providers>
|
<providers>
|
||||||
<provider
|
<provider
|
||||||
name="Gmail"
|
name="Gmail"
|
||||||
domain="gmail.com"
|
domain="gmail\\.com"
|
||||||
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq6"
|
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq6"
|
||||||
order="1"
|
order="1"
|
||||||
type="com.google">
|
type="com.google">
|
||||||
|
@ -17,6 +17,7 @@
|
||||||
</provider>
|
</provider>
|
||||||
<provider
|
<provider
|
||||||
name="Outlook/Office365"
|
name="Outlook/Office365"
|
||||||
|
domain="outlook.*"
|
||||||
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
|
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
|
||||||
order="2">
|
order="2">
|
||||||
<imap
|
<imap
|
||||||
|
@ -56,7 +57,7 @@
|
||||||
</provider>
|
</provider>
|
||||||
<provider
|
<provider
|
||||||
name="Posteo.de"
|
name="Posteo.de"
|
||||||
domain="posteo.net"
|
domain="posteo\\.net"
|
||||||
link="https://posteo.de/en/help/how-do-i-set-up-posteo-in-an-email-client-pop3-imap-and-smtp">
|
link="https://posteo.de/en/help/how-do-i-set-up-posteo-in-an-email-client-pop3-imap-and-smtp">
|
||||||
<imap
|
<imap
|
||||||
host="posteo.de"
|
host="posteo.de"
|
||||||
|
@ -178,8 +179,8 @@
|
||||||
<provider
|
<provider
|
||||||
name="web.de"
|
name="web.de"
|
||||||
keepalive="9"
|
keepalive="9"
|
||||||
user="local"
|
link="https://hilfe.web.de/pop-imap/imap/imap-serverdaten.html"
|
||||||
link="https://hilfe.web.de/pop-imap/imap/imap-serverdaten.html">
|
user="local">
|
||||||
<imap
|
<imap
|
||||||
host="imap.web.de"
|
host="imap.web.de"
|
||||||
port="993"
|
port="993"
|
||||||
|
@ -311,7 +312,7 @@
|
||||||
</provider>
|
</provider>
|
||||||
<provider
|
<provider
|
||||||
name="KPN mail"
|
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"
|
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">
|
link="https://www.kpn.com/service/internet/e-mail/instellen-laptop-pc.htm">
|
||||||
<imap
|
<imap
|
||||||
host="imap.kpnmail.nl"
|
host="imap.kpnmail.nl"
|
||||||
|
@ -324,7 +325,7 @@
|
||||||
</provider>
|
</provider>
|
||||||
<provider
|
<provider
|
||||||
name="/e/"
|
name="/e/"
|
||||||
domain="e.email"
|
domain="e\\.email"
|
||||||
link="https://e.foundation/email-configuration/">
|
link="https://e.foundation/email-configuration/">
|
||||||
<imap
|
<imap
|
||||||
host="mail.ecloud.global"
|
host="mail.ecloud.global"
|
||||||
|
|
Loading…
Reference in New Issue