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

Merge pull request #3955 from k9mail/remove_pop3_from_providers_xml

Browse source 
Remove POP3 settings from providers.xml
This commit is contained in:
cketti 2019-03-10 18:05:53 +01:00 committed by GitHub
commit 9c8cb1c754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/ui/src/main/res/xml/providers.xml
View file

@ -40,11 +40,6 @@
imap+ssl+ IMAP with required SSL transport security. imap+ssl+ IMAP with required SSL transport security.
If SSL is not available the connection fails. If SSL is not available the connection fails.
pop3+tls+ POP3 with required TLS transport security.
If TLS is not available the connection fails.
pop3+ssl+ POP3 with required SSL transport security.
If SSL is not available the connection fails.
Valid outgoing uri schemes are: Valid outgoing uri schemes are:
smtp+tls+ SMTP with required TLS transport security. smtp+tls+ SMTP with required TLS transport security.
If TLS is not available the connection fails. If TLS is not available the connection fails.
@ -53,8 +48,8 @@
The URIs should be full templates for connection, including a port if The URIs should be full templates for connection, including a port if
the service uses a non-default port. The default ports are as follows: the service uses a non-default port. The default ports are as follows:
imap+tls+ 143 pop3+tls+ 110 smtp+tls+ 587 imap+tls+ 143 smtp+tls+ 587
imap+ssl+ 993 pop3+ssl+ 995 smtp+ssl+ 465 imap+ssl+ 993 smtp+ssl+ 465
The username attribute is used to supply a template for the username The username attribute is used to supply a template for the username
that will be presented to the server. This username is built from a that will be presented to the server. This username is built from a
@ -66,7 +61,7 @@
$user - the value before the @ sign in the email address the user entered $user - the value before the @ sign in the email address the user entered
$domain - the value after the @ sign in the email address the user entered $domain - the value after the @ sign in the email address the user entered
The username attribute MUST be specified for the incoming element, so the POP3 or IMAP The username attribute MUST be specified for the incoming element, so the IMAP
server can identify the mailbox to be opened. server can identify the mailbox to be opened.
The username attribute MAY be the empty string for the outgoing element, but only if the The username attribute MAY be the empty string for the outgoing element, but only if the
@ -101,10 +96,6 @@
<incoming uri="imap+ssl+://imap.comcast.net" username="$email" /> <incoming uri="imap+ssl+://imap.comcast.net" username="$email" />
<outgoing uri="smtp+tls+://smtp.comcast.net" username="$email" /> <outgoing uri="smtp+tls+://smtp.comcast.net" username="$email" />
</provider> </provider>
<provider id="cox" label="Cox" domain="cox.net">
<incoming uri="pop3+ssl+://pop.east.cox.net" username="$user" />
<outgoing uri="smtp+ssl+://smtp.east.cox.net" username="$user" />
</provider>
<provider id="live" label="Windows Live Hotmail" domain="live.com"> <provider id="live" label="Windows Live Hotmail" domain="live.com">
<incoming uri="imap+ssl+://imap-mail.outlook.com" username="$email" /> <incoming uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
<outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" /> <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
@ -133,10 +124,6 @@
<incoming uri="imap+ssl+://imap.zoho.com" username="$email" /> <incoming uri="imap+ssl+://imap.zoho.com" username="$email" />
<outgoing uri="smtp+tls+://smtp.zoho.com" username="$email" /> <outgoing uri="smtp+tls+://smtp.zoho.com" username="$email" />
</provider> </provider>
<provider id="gnu" label="GNU" domain="gnu.org">
<incoming uri="pop3+ssl+://fencepost.gnu.org" username="$user" />
<outgoing uri="smtp+tls+://fencepost.gnu.org" username="$user" />
</provider>
<provider id="riseup" label="Riseup Networks" domain="riseup.net"> <provider id="riseup" label="Riseup Networks" domain="riseup.net">
<incoming uri="imap+ssl+://mail.riseup.net" username="$user" /> <incoming uri="imap+ssl+://mail.riseup.net" username="$user" />
<outgoing uri="smtp+tls+://mail.riseup.net" username="$user" /> <outgoing uri="smtp+tls+://mail.riseup.net" username="$user" />
@ -271,10 +258,6 @@
<incoming uri="imap+ssl+://imap.uk.aol.com" label="IMAP" username="$user" /> <incoming uri="imap+ssl+://imap.uk.aol.com" label="IMAP" username="$user" />
<outgoing uri="smtp+ssl+://smtp.uk.aol.com" username="$user" /> <outgoing uri="smtp+ssl+://smtp.uk.aol.com" username="$user" />
</provider> </provider>
<provider id="yahoo-uk" label="Yahoo" domain="yahoo.co.uk">
<incoming uri="pop3+ssl+://pop.mail.yahoo.co.uk" username="$user" />
<outgoing uri="smtp+ssl+://smtp.mail.yahoo.co.uk" username="$user" />
</provider>
<provider id="live-uk" label="Windows Live Hotmail" domain="live.co.uk"> <provider id="live-uk" label="Windows Live Hotmail" domain="live.co.uk">
<incoming uri="imap+ssl+://imap-mail.outlook.com" username="$email" /> <incoming uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
<outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" /> <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
@ -472,16 +455,6 @@
<outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" /> <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
</provider> </provider>
<!-- Poland -->
<provider id="interia" label="Interia" domain="interia.pl">
<incoming uri="pop3+ssl+://poczta.interia.pl" username="$user" />
<outgoing uri="smtp+ssl+://poczta.interia.pl" username="$user" />
</provider>
<provider id="o2" label="O2" domain="o2.pl">
<incoming uri="pop3+ssl+://poczta.o2.pl" username="$user" />
<outgoing uri="smtp+ssl+://poczta.o2.pl" username="$user" />
</provider>
<!-- Japanese --> <!-- Japanese -->
<provider id="auone" label="au one" domain="auone.jp" <provider id="auone" label="au one" domain="auone.jp"
note="@string/provider_note_auonejp"> note="@string/provider_note_auonejp">