msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added imap/starttls to providers

Browse Source
pull/146/head
M66B 7 years ago
parent ae4d6cab95
commit 3fee71b289
4 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -249,6 +249,7 @@ public class FragmentAccount extends FragmentEx {
etHost.setText(provider.imap_host); etHost.setText(provider.imap_host);
etPort.setText(provider.imap_host == null ? null : Integer.toString(provider.imap_port)); etPort.setText(provider.imap_host == null ? null : Integer.toString(provider.imap_port));
cbStartTls.setChecked(provider.imap_starttls);
etUser.setText(null); etUser.setText(null);
tilPassword.getEditText().setText(null); tilPassword.getEditText().setText(null);
@ -292,6 +293,7 @@ public class FragmentAccount extends FragmentEx {
if (srv != null) { if (srv != null) {
etHost.setText(srv.getTarget().toString(true)); etHost.setText(srv.getTarget().toString(true));
etPort.setText(Integer.toString(srv.getPort())); etPort.setText(Integer.toString(srv.getPort()));
cbStartTls.setChecked(srv.getPort() == 143);
} }
} }

4
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -175,7 +175,7 @@ public class FragmentIdentity extends FragmentEx {
// This is needed because the spinner might be invisible // This is needed because the spinner might be invisible
etHost.setText(provider.smtp_host); etHost.setText(provider.smtp_host);
etPort.setText(Integer.toString(provider.smtp_port)); etPort.setText(Integer.toString(provider.smtp_port));
cbStartTls.setChecked(provider.starttls); cbStartTls.setChecked(provider.smtp_starttls);
break; break;
} }
@ -210,7 +210,7 @@ public class FragmentIdentity extends FragmentEx {
// Set associated host/port/starttls // Set associated host/port/starttls
etHost.setText(provider.smtp_host); etHost.setText(provider.smtp_host);
etPort.setText(position == 0 ? null : Integer.toString(provider.smtp_port)); etPort.setText(position == 0 ? null : Integer.toString(provider.smtp_port));
cbStartTls.setChecked(provider.starttls); cbStartTls.setChecked(provider.smtp_starttls);
} }
@Override @Override

6
app/src/main/java/eu/faircode/email/Provider.java
Unescape View File

@ -37,10 +37,11 @@ public class Provider {
public String link; public String link;
public String type; public String type;
public String imap_host; public String imap_host;
public boolean imap_starttls;
public int imap_port; public int imap_port;
public String smtp_host; public String smtp_host;
public int smtp_port; public int smtp_port;
public boolean starttls; public boolean smtp_starttls;
private Provider() { private Provider() {
} }
@ -67,10 +68,11 @@ public class Provider {
} else if ("imap".equals(xml.getName())) { } else if ("imap".equals(xml.getName())) {
provider.imap_host = xml.getAttributeValue(null, "host"); provider.imap_host = xml.getAttributeValue(null, "host");
provider.imap_port = xml.getAttributeIntValue(null, "port", 0); provider.imap_port = xml.getAttributeIntValue(null, "port", 0);
provider.imap_starttls = xml.getAttributeBooleanValue(null, "starttls", false);
} else if ("smtp".equals(xml.getName())) { } else if ("smtp".equals(xml.getName())) {
provider.smtp_host = xml.getAttributeValue(null, "host"); provider.smtp_host = xml.getAttributeValue(null, "host");
provider.smtp_port = xml.getAttributeIntValue(null, "port", 0); provider.smtp_port = xml.getAttributeIntValue(null, "port", 0);
provider.starttls = xml.getAttributeBooleanValue(null, "starttls", false); provider.smtp_starttls = xml.getAttributeBooleanValue(null, "starttls", false);
} else } else
throw new IllegalAccessException(xml.getName()); throw new IllegalAccessException(xml.getName());
} else if (eventType == XmlPullParser.END_TAG) { } else if (eventType == XmlPullParser.END_TAG) {

57
app/src/main/res/xml/providers.xml
Unescape View File

@ -6,7 +6,8 @@
type="com.google"> type="com.google">
<imap <imap
host="imap.gmail.com" host="imap.gmail.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.gmail.com" host="smtp.gmail.com"
port="465" port="465"
@ -17,7 +18,8 @@
link="https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040"> link="https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040">
<imap <imap
host="imap-mail.outlook.com" host="imap-mail.outlook.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp-mail.outlook.com" host="smtp-mail.outlook.com"
port="587" port="587"
@ -29,7 +31,8 @@
link="https://userforum-en.mailbox.org/knowledge-base/article/setup-other-e-mail-clients-manually"> link="https://userforum-en.mailbox.org/knowledge-base/article/setup-other-e-mail-clients-manually">
<imap <imap
host="imap.mailbox.org" host="imap.mailbox.org"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.mailbox.org" host="smtp.mailbox.org"
port="465" port="465"
@ -41,7 +44,8 @@
link="https://help.yahoo.com/kb/SLN4075.html"> link="https://help.yahoo.com/kb/SLN4075.html">
<imap <imap
host="imap.mail.yahoo.com" host="imap.mail.yahoo.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.mail.yahoo.com" host="smtp.mail.yahoo.com"
port="465" port="465"
@ -52,7 +56,8 @@
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"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="posteo.de" host="posteo.de"
port="465" port="465"
@ -63,7 +68,8 @@
link="https://www.free.fr/assistance/597.html"> link="https://www.free.fr/assistance/597.html">
<imap <imap
host="imap.free.fr" host="imap.free.fr"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.free.fr" host="smtp.free.fr"
port="465" port="465"
@ -74,7 +80,8 @@
link="https://www.fastmail.com/help/technical/servernamesandports.html"> link="https://www.fastmail.com/help/technical/servernamesandports.html">
<imap <imap
host="imap.fastmail.com" host="imap.fastmail.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.fastmail.com" host="smtp.fastmail.com"
port="465" port="465"
@ -86,7 +93,8 @@
link="https://assistance.sfr.fr/service-et-accessoire/sfr-mail/serveurs-messagerie-sfr.html"> link="https://assistance.sfr.fr/service-et-accessoire/sfr-mail/serveurs-messagerie-sfr.html">
<imap <imap
host="imap.sfr.fr" host="imap.sfr.fr"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.sfr.fr" host="smtp.sfr.fr"
port="465" port="465"
@ -97,7 +105,8 @@
link="https://www.infomaniak.com/fr/support/faq/1075/configurer-une-adresse-email-configuration-logiciel-de-messagerie-parametres-courrier"> link="https://www.infomaniak.com/fr/support/faq/1075/configurer-une-adresse-email-configuration-logiciel-de-messagerie-parametres-courrier">
<imap <imap
host="mail.infomaniak.com" host="mail.infomaniak.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="mail.infomaniak.com" host="mail.infomaniak.com"
port="587" port="587"
@ -106,7 +115,8 @@
<provider name="OVH.net"> <provider name="OVH.net">
<imap <imap
host="ssl0.ovh.net" host="ssl0.ovh.net"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="ssl0.ovh.net" host="ssl0.ovh.net"
port="465" port="465"
@ -117,7 +127,8 @@
link="https://support.gmx.com/pop-imap/imap/index.html#breadcrumb_help_pop-imap_imap_server"> link="https://support.gmx.com/pop-imap/imap/index.html#breadcrumb_help_pop-imap_imap_server">
<imap <imap
host="imap.gmx.com" host="imap.gmx.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="mail.gmx.com" host="mail.gmx.com"
port="587" port="587"
@ -126,7 +137,8 @@
<provider name="disroot.org"> <provider name="disroot.org">
<imap <imap
host="disroot.org" host="disroot.org"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="disroot.org" host="disroot.org"
port="587" port="587"
@ -137,7 +149,8 @@
link="https://mail.de/hilfe/pop3-imap-einstellungen"> link="https://mail.de/hilfe/pop3-imap-einstellungen">
<imap <imap
host="imap.mail.de" host="imap.mail.de"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.mail.de" host="smtp.mail.de"
port="465" port="465"
@ -148,7 +161,8 @@
link="https://yandex.com/support/mail/mail-clients.html#imap"> link="https://yandex.com/support/mail/mail-clients.html#imap">
<imap <imap
host="imap.yandex.com" host="imap.yandex.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.yandex.com" host="smtp.yandex.com"
port="465" port="465"
@ -159,7 +173,8 @@
link="https://hilfe.web.de/pop-imap/imap/imap-serverdaten.html"> link="https://hilfe.web.de/pop-imap/imap/imap-serverdaten.html">
<imap <imap
host="imap.web.de" host="imap.web.de"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.web.de" host="smtp.web.de"
port="587" port="587"
@ -170,7 +185,8 @@
link="https://www.telstra.com.au/support/category/email/set-up/imap-pop-and-smtp-information-for-manual-email-set-up"> link="https://www.telstra.com.au/support/category/email/set-up/imap-pop-and-smtp-information-for-manual-email-set-up">
<imap <imap
host="imap.telstra.com" host="imap.telstra.com"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.telstra.com" host="smtp.telstra.com"
port="465" port="465"
@ -181,7 +197,8 @@
link="https://www.telekom.de/hilfe/festnetz-internet-tv/e-mail/e-mail-server-e-mail-protokolle-und-e-mail-einrichtung/imap/einrichtung-imap"> link="https://www.telekom.de/hilfe/festnetz-internet-tv/e-mail/e-mail-server-e-mail-protokolle-und-e-mail-einrichtung/imap/einrichtung-imap">
<imap <imap
host="secureimap.t-online.de" host="secureimap.t-online.de"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="securesmtp.t-online.de" host="securesmtp.t-online.de"
port="465" port="465"
@ -192,7 +209,8 @@
link="https://hilfe.webmailer.1und1.de/mailprogramme/imap.html"> link="https://hilfe.webmailer.1und1.de/mailprogramme/imap.html">
<imap <imap
host="imap.1und1.de" host="imap.1und1.de"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.1und1.de" host="smtp.1und1.de"
port="465" port="465"
@ -203,7 +221,8 @@
link="https://dismail.de/info.html"> link="https://dismail.de/info.html">
<imap <imap
host="imap.dismail.de" host="imap.dismail.de"
port="993" /> port="993"
starttls="false" />
<smtp <smtp
host="smtp.dismail.de" host="smtp.dismail.de"
port="465" port="465"

Write Preview
Loading…
Cancel
Save