diff options
| author | Marc Blank <mblank@google.com> | 2011-09-14 17:06:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-14 17:06:22 -0700 |
| commit | 5602ba92a03f6c9f99cfb20685439d4a16707d62 (patch) | |
| tree | 568616a3aad9128c40b4e5660aa269a5adeaab72 /res/xml | |
| parent | 5d44feaf30d552813120f9cc08fa7e233e455ca5 (diff) | |
| parent | 1b65e834c3d3281de9e0eb74e04def6ded8baa14 (diff) | |
| download | android_packages_apps_Email-5602ba92a03f6c9f99cfb20685439d4a16707d62.tar.gz android_packages_apps_Email-5602ba92a03f6c9f99cfb20685439d4a16707d62.tar.bz2 android_packages_apps_Email-5602ba92a03f6c9f99cfb20685439d4a16707d62.zip | |
Merge "Allow multiple wildcards in providers.xml; add hotmail domains"
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/providers.xml | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/res/xml/providers.xml b/res/xml/providers.xml index a223d2fa3..2541fe0da 100644 --- a/res/xml/providers.xml +++ b/res/xml/providers.xml @@ -91,9 +91,12 @@ contain pattern matching characters that can be used to match user entered domains without knowing the exact domain. - The domain attribute may specify a most one global character - a '*'. The - global character matches zero or more characters. This is a very greedy wild - card and may lead to unexpected matches. + An asterisk (*) is used to match that part of a domain name that is demarcated + by a period (dot); no other characters may appear on either side of an asterisk. + Therefore, foo.*.com and *.mail.com are valid, whereas a*.com and foo.c* are not. + An asterisk is also not greedy; it only matches a single part of a domain name; + therefore, foo.bar.bletch is NOT matched by foo.*; it does, however, match + foo.*.* or foo.bar.*. The alternate is the wild card character - a '?'. The wild card character matches any single character. This is very useful when the number of characters @@ -168,15 +171,39 @@ <!-- Hotmail and variants. NOTE: These are handled by exchange if available, else POP3. --> <!-- EXCHANGE-REMOVE-SECTION-START --> - <provider id="live" label="Windows Live Hotmail Plus" domain="live.com"> + <provider id="live1" label="Windows Live Hotmail Plus" domain="live.*"> <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> </provider> - <provider id="hotmail" label="Windows Live Hotmail Plus" domain="hotmail.com"> + <provider id="live2" label="Windows Live Hotmail Plus" domain="live.*.*"> <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> </provider> - <provider id="msn" label="Windows Live Hotmail Plus" domain="msn.com"> + <provider id="live3" label="Windows Live Hotmail Plus" domain="*.live.*"> + <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> + <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> + </provider> + <provider id="hotmail1" label="Windows Live Hotmail Plus" domain="hotmail.*"> + <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> + <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> + </provider> + <provider id="hotmail2" label="Windows Live Hotmail Plus" domain="hotmail.*.*"> + <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> + <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> + </provider> + <provider id="hotmail3" label="Windows Live Hotmail Plus" domain="livemail.*"> + <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> + <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> + </provider> + <provider id="hotmail4" label="Windows Live Hotmail Plus" domain="livemail.*.*"> + <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> + <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> + </provider> + <provider id="msn" label="Windows Live Hotmail Plus" domain="msn.*"> + <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> + <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> + </provider> + <provider id="msnhotmail" label="Windows Live Hotmail Plus" domain="msnhotmail.com"> <incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> </provider> |