summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRégis Décamps <regisd@google.com>2014-10-17 14:18:48 +0200
committerRégis Décamps <regisd@google.com>2014-10-17 14:23:44 +0200
commitd7192f0213d6468084c1e18d73ee3cb8c6387b61 (patch)
tree528d3d3039b5ba8f5ec554dc86d3de8d7032fbbc /res
parentf61e098a4161dd52f1d81c577520ce96b617480d (diff)
downloadandroid_packages_apps_Email-d7192f0213d6468084c1e18d73ee3cb8c6387b61.tar.gz
android_packages_apps_Email-d7192f0213d6468084c1e18d73ee3cb8c6387b61.tar.bz2
android_packages_apps_Email-d7192f0213d6468084c1e18d73ee3cb8c6387b61.zip
Provider configuration for outlook, yahoo, gmx
Use the defautl configuration for Outlook, Yahoo and GMX on all regional variants, rather than just `.com`. Bug: 18027714 The default configuration for outlook.fr is not correct Bug: 17156903 Update providers.xml with more up-to-date data Change-Id: I88b5a3d5e467eb0fc40e398264478fe0a24c33ee
Diffstat (limited to 'res')
-rw-r--r--res/xml/providers.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index 9bff0ebba..40b8647cc 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -237,7 +237,7 @@
<incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
<outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
</provider>
- <provider id="outlook" label="Outlook" domain="outlook.com">
+ <provider id="outlook" label="Outlook" domain="outlook.*">
<incoming uri="eas+ssl+://m.hotmail.com" username="$email" />
<outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
<incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
@@ -245,7 +245,11 @@
</provider>
<!-- Yahoo! Mail variants -->
- <provider id="yahoo" label="Yahoo!" domain="yahoo.com">
+ <provider id="yahoo" label="Yahoo!" domain="yahoo.*">
+ <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+ <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+ </provider>
+ <provider id="yahoo1" label="Yahoo!" domain="yahoo.*.*">
<incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
<outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
</provider>
@@ -357,7 +361,7 @@
<incoming uri="pop3://mx.freenet.de" username="$user" />
<outgoing uri="smtp+ssl://mx.freenet.de" username="$email" />
</provider>
- <provider id="gmx" label="GMX" domain="gmx.de">
+ <provider id="gmx" label="GMX" domain="gmx.*">
<incoming uri="pop3://pop.gmx.net" username="$email" />
<outgoing uri="smtp://mail.gmx.net" username="$email" />
</provider>