ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge change 25721 into eclair

Browse Source 
* changes:
  Clean up transport encryption & port options
This commit is contained in:
Android (Google) Code Review 2009-09-18 12:04:31 -04:00
commit a96c941d9f
3 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
res/xml/providers.xml
View File

@ -51,32 +51,29 @@
Valid incoming uri schemes are: Valid incoming uri schemes are:
imap IMAP with no transport security. imap IMAP with no transport security.
imap+tls IMAP with optional TLS transport security.
If TLS is not available the connection is made as "imap"
imap+tls+ IMAP with required TLS transport security. imap+tls+ IMAP with required TLS transport security.
If TLS is not available the conneciton fails. If TLS is not available the connection fails.
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 POP3 with no transport security. pop3 POP3 with no transport security.
pop3+tls POP3 with optional TLS transport security.
If TLS is not available the connection is made as "pop3"
pop3+tls+ POP3 with required TLS transport security. pop3+tls+ POP3 with required TLS transport security.
If TLS is not available the conneciton fails. If TLS is not available the connection fails.
pop3+ssl+ POP3 with required SSL transport security. pop3+ssl+ POP3 with required SSL transport security.
If SSL is not available the connection fails. If SSL is not available the connection fails.
Valid outgoing uri schemes are: Valid outgoing uri schemes are:
smtp SMTP with no transport security. smtp SMTP with no transport security.
smtp+tls SMTP with optional TLS transport security.
If TLS is not available the connection is made as "smtp"
smtp+tls+ SMTP with required TLS transport security. smtp+tls+ SMTP with required TLS transport security.
If TLS is not available the conneciton fails. If TLS is not available the connection fails.
smtp+ssl+ SMTP with required SSL transport security. smtp+ssl+ SMTP with required SSL transport security.
If SSL is not available the connection fails. If SSL is not available the connection fails.
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 service uses a non-default port. The default ports are as follows:
imap 143 pop3 110 smtp 587
imap+tls+ 143 pop3+tls+ 110 smtp+tls+ 587
imap+ssl+ 993 pop3+ssl+ 995 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
@ -118,11 +115,11 @@
<!-- USA --> <!-- USA -->
<provider id="aim" label="AIM" domain="aim.com"> <provider id="aim" label="AIM" domain="aim.com">
<incoming uri="imap://imap.aim.com" label="IMAP" username="$email" /> <incoming uri="imap://imap.aim.com" label="IMAP" username="$email" />
<outgoing uri="smtp://smtp.aim.com:587" username="$email" /> <outgoing uri="smtp://smtp.aim.com" username="$email" />
</provider> </provider>
<provider id="aol" label="AOL" domain="aol.com"> <provider id="aol" label="AOL" domain="aol.com">
<incoming uri="imap://imap.aol.com" label="IMAP" username="$email" /> <incoming uri="imap://imap.aol.com" label="IMAP" username="$email" />
<outgoing uri="smtp://smtp.aol.com:587" username="$email" /> <outgoing uri="smtp://smtp.aol.com" username="$email" />
</provider> </provider>
<provider id="comcast" label="Comcast" domain="comcast.net"> <provider id="comcast" label="Comcast" domain="comcast.net">
<incoming uri="pop3+ssl+://mail.comcast.net" username="$user" /> <incoming uri="pop3+ssl+://mail.comcast.net" username="$user" />
@ -136,9 +133,10 @@
<incoming uri="pop3+ssl+://pop.east.cox.net" username="$user" /> <incoming uri="pop3+ssl+://pop.east.cox.net" username="$user" />
<outgoing uri="smtp+ssl+://smtp.east.cox.net" username="$user" /> <outgoing uri="smtp+ssl+://smtp.east.cox.net" username="$user" />
</provider> </provider>
<!-- Note: smtp.mac.com accepts TLS but the cert is untrusted -->
<provider id="dotmac" label=".Mac" domain="mac.com"> <provider id="dotmac" label=".Mac" domain="mac.com">
<incoming uri="imap+tls://mail.mac.com" username="$email" /> <incoming uri="imap+ssl+://mail.mac.com" username="$email" />
<outgoing uri="smtp+tls://smtp.mac.com" username="$email" /> <outgoing uri="smtp://smtp.mac.com" username="$email" />
</provider> </provider>
<provider id="earthlink" label="Earthlink" domain="earthlink.net"> <provider id="earthlink" label="Earthlink" domain="earthlink.net">
<incoming uri="pop3://pop.earthlink.net" username="$email" /> <incoming uri="pop3://pop.earthlink.net" username="$email" />
@ -163,9 +161,11 @@
<incoming uri="pop3+ssl+://pop3.live.com" username="$email" /> <incoming uri="pop3+ssl+://pop3.live.com" username="$email" />
<outgoing uri="smtp+tls+://smtp.live.com" username="$email" /> <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
</provider> </provider>
<!-- Note: Mac Mail.app sets IMAP to mail.mac.com, but it's the same server -->
<!-- Note: smtp.mac.com accepts TLS but the cert is untrusted -->
<provider id="mobileme" label="MobileMe" domain="me.com"> <provider id="mobileme" label="MobileMe" domain="me.com">
<incoming uri="imap+tls://mail.me.com" username="$email" /> <incoming uri="imap+ssl+://mail.me.com" username="$email" />
<outgoing uri="smtp+tls://smtp.me.com" username="$email" /> <outgoing uri="smtp://smtp.me.com" username="$email" />
</provider> </provider>
<provider id="netzero" label="NetZero" domain="netzero.com"> <provider id="netzero" label="NetZero" domain="netzero.com">
<incoming uri="pop3://pop.netzero.com" username="$user" /> <incoming uri="pop3://pop.netzero.com" username="$user" />
@ -204,8 +204,8 @@
<outgoing uri="smtp+ssl://mx.freenet.de" username="$email" /> <outgoing uri="smtp+ssl://mx.freenet.de" username="$email" />
</provider> </provider>
<provider id="gmx" label="GMX" domain="gmx.de"> <provider id="gmx" label="GMX" domain="gmx.de">
<incoming uri="pop3+tls://pop.gmx.net" username="$email" /> <incoming uri="pop3://pop.gmx.net" username="$email" />
<outgoing uri="smtp+tls://mail.gmx.net" username="$email" /> <outgoing uri="smtp://mail.gmx.net" username="$email" />
</provider> </provider>
<provider id="T-Online" label="T-Online" domain="t-online.de" <provider id="T-Online" label="T-Online" domain="t-online.de"
note="@string/provider_note_t_online"> note="@string/provider_note_t_online">
@ -213,8 +213,8 @@
<outgoing uri="smtp://smtpmail.t-online.de" username="$email" /> <outgoing uri="smtp://smtpmail.t-online.de" username="$email" />
</provider> </provider>
<provider id="web.de" label="Web.de" domain="web.de"> <provider id="web.de" label="Web.de" domain="web.de">
<incoming uri="pop3+tls://pop3.web.de" username="$user" /> <incoming uri="pop3://pop3.web.de" username="$user" />
<outgoing uri="smtp+tls://smtp.web.de" username="$user" /> <outgoing uri="smtp://smtp.web.de" username="$user" />
</provider> </provider>
<!-- Netherlands --> <!-- Netherlands -->

16
src/com/android/email/activity/setup/AccountSetupIncoming.java
View File

@ -46,16 +46,16 @@ public class AccountSetupIncoming extends Activity implements OnClickListener {
private static final String EXTRA_MAKE_DEFAULT = "makeDefault"; private static final String EXTRA_MAKE_DEFAULT = "makeDefault";
private static final int popPorts[] = { private static final int popPorts[] = {
110, 995, 995, 110, 110 110, 995, 110
}; };
private static final String popSchemes[] = { private static final String popSchemes[] = {
"pop3", "pop3+ssl", "pop3+ssl+", "pop3+tls", "pop3+tls+" "pop3", "pop3+ssl+", "pop3+tls+"
}; };
private static final int imapPorts[] = { private static final int imapPorts[] = {
143, 993, 993, 143, 143 143, 993, 143
}; };
private static final String imapSchemes[] = { private static final String imapSchemes[] = {
"imap", "imap+ssl", "imap+ssl+", "imap+tls", "imap+tls+" "imap", "imap+ssl+", "imap+tls+"
}; };
private final static int DIALOG_DUPLICATE_ACCOUNT = 1; private final static int DIALOG_DUPLICATE_ACCOUNT = 1;
@ -110,12 +110,8 @@ public class AccountSetupIncoming extends Activity implements OnClickListener {
SpinnerOption securityTypes[] = { SpinnerOption securityTypes[] = {
new SpinnerOption(0, getString(R.string.account_setup_incoming_security_none_label)), new SpinnerOption(0, getString(R.string.account_setup_incoming_security_none_label)),
new SpinnerOption(1, new SpinnerOption(1, getString(R.string.account_setup_incoming_security_ssl_label)),
getString(R.string.account_setup_incoming_security_ssl_optional_label)), new SpinnerOption(2, getString(R.string.account_setup_incoming_security_tls_label)),
new SpinnerOption(2, getString(R.string.account_setup_incoming_security_ssl_label)),
new SpinnerOption(3,
getString(R.string.account_setup_incoming_security_tls_optional_label)),
new SpinnerOption(4, getString(R.string.account_setup_incoming_security_tls_label)),
}; };
SpinnerOption deletePolicies[] = { SpinnerOption deletePolicies[] = {

12
src/com/android/email/activity/setup/AccountSetupOutgoing.java
View File

@ -48,11 +48,11 @@ public class AccountSetupOutgoing extends Activity implements OnClickListener,
private static final String EXTRA_MAKE_DEFAULT = "makeDefault"; private static final String EXTRA_MAKE_DEFAULT = "makeDefault";
private static final int smtpPorts[] = { private static final int smtpPorts[] = {
25, 465, 465, 25, 25 587, 465, 587
}; };
private static final String smtpSchemes[] = { private static final String smtpSchemes[] = {
"smtp", "smtp+ssl", "smtp+ssl+", "smtp+tls", "smtp+tls+" "smtp", "smtp+ssl+", "smtp+tls+"
}; };
private EditText mUsernameView; private EditText mUsernameView;
@ -101,12 +101,8 @@ public class AccountSetupOutgoing extends Activity implements OnClickListener,
SpinnerOption securityTypes[] = { SpinnerOption securityTypes[] = {
new SpinnerOption(0, getString(R.string.account_setup_incoming_security_none_label)), new SpinnerOption(0, getString(R.string.account_setup_incoming_security_none_label)),
new SpinnerOption(1, new SpinnerOption(1, getString(R.string.account_setup_incoming_security_ssl_label)),
getString(R.string.account_setup_incoming_security_ssl_optional_label)), new SpinnerOption(2, getString(R.string.account_setup_incoming_security_tls_label)),
new SpinnerOption(2, getString(R.string.account_setup_incoming_security_ssl_label)),
new SpinnerOption(3,
getString(R.string.account_setup_incoming_security_tls_optional_label)),
new SpinnerOption(4, getString(R.string.account_setup_incoming_security_tls_label)),
}; };
ArrayAdapter<SpinnerOption> securityTypesAdapter = new ArrayAdapter<SpinnerOption>(this, ArrayAdapter<SpinnerOption> securityTypesAdapter = new ArrayAdapter<SpinnerOption>(this,