From 3fee71b2896f1a9661799e3483ab1de49c6701b1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 9 Nov 2018 14:48:21 +0000
Subject: [PATCH] Added imap/starttls to providers

---
 .../eu/faircode/email/FragmentAccount.java    |  2 +
 .../eu/faircode/email/FragmentIdentity.java   |  4 +-
 .../main/java/eu/faircode/email/Provider.java |  6 +-
 app/src/main/res/xml/providers.xml            | 57 ++++++++++++-------
 4 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 37141292d8..f024b7b166 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -249,6 +249,7 @@ public class FragmentAccount extends FragmentEx {
 
                 etHost.setText(provider.imap_host);
                 etPort.setText(provider.imap_host == null ? null : Integer.toString(provider.imap_port));
+                cbStartTls.setChecked(provider.imap_starttls);
 
                 etUser.setText(null);
                 tilPassword.getEditText().setText(null);
@@ -292,6 +293,7 @@ public class FragmentAccount extends FragmentEx {
                         if (srv != null) {
                             etHost.setText(srv.getTarget().toString(true));
                             etPort.setText(Integer.toString(srv.getPort()));
+                            cbStartTls.setChecked(srv.getPort() == 143);
                         }
                     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 150321f151..1ea5a4b9d8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -175,7 +175,7 @@ public class FragmentIdentity extends FragmentEx {
                             // This is needed because the spinner might be invisible
                             etHost.setText(provider.smtp_host);
                             etPort.setText(Integer.toString(provider.smtp_port));
-                            cbStartTls.setChecked(provider.starttls);
+                            cbStartTls.setChecked(provider.smtp_starttls);
 
                             break;
                         }
@@ -210,7 +210,7 @@ public class FragmentIdentity extends FragmentEx {
                 // Set associated host/port/starttls
                 etHost.setText(provider.smtp_host);
                 etPort.setText(position == 0 ? null : Integer.toString(provider.smtp_port));
-                cbStartTls.setChecked(provider.starttls);
+                cbStartTls.setChecked(provider.smtp_starttls);
             }
 
             @Override
diff --git a/app/src/main/java/eu/faircode/email/Provider.java b/app/src/main/java/eu/faircode/email/Provider.java
index c182d1dc0a..47b23d8e4d 100644
--- a/app/src/main/java/eu/faircode/email/Provider.java
+++ b/app/src/main/java/eu/faircode/email/Provider.java
@@ -37,10 +37,11 @@ public class Provider {
     public String link;
     public String type;
     public String imap_host;
+    public boolean imap_starttls;
     public int imap_port;
     public String smtp_host;
     public int smtp_port;
-    public boolean starttls;
+    public boolean smtp_starttls;
 
     private Provider() {
     }
@@ -67,10 +68,11 @@ public class Provider {
                     } else if ("imap".equals(xml.getName())) {
                         provider.imap_host = xml.getAttributeValue(null, "host");
                         provider.imap_port = xml.getAttributeIntValue(null, "port", 0);
+                        provider.imap_starttls = xml.getAttributeBooleanValue(null, "starttls", false);
                     } else if ("smtp".equals(xml.getName())) {
                         provider.smtp_host = xml.getAttributeValue(null, "host");
                         provider.smtp_port = xml.getAttributeIntValue(null, "port", 0);
-                        provider.starttls = xml.getAttributeBooleanValue(null, "starttls", false);
+                        provider.smtp_starttls = xml.getAttributeBooleanValue(null, "starttls", false);
                     } else
                         throw new IllegalAccessException(xml.getName());
                 } else if (eventType == XmlPullParser.END_TAG) {
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 6aa5cb9c63..3c91089aba 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -6,7 +6,8 @@
         type="com.google">
         <imap
             host="imap.gmail.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.gmail.com"
             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">
         <imap
             host="imap-mail.outlook.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp-mail.outlook.com"
             port="587"
@@ -29,7 +31,8 @@
         link="https://userforum-en.mailbox.org/knowledge-base/article/setup-other-e-mail-clients-manually">
         <imap
             host="imap.mailbox.org"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.mailbox.org"
             port="465"
@@ -41,7 +44,8 @@
         link="https://help.yahoo.com/kb/SLN4075.html">
         <imap
             host="imap.mail.yahoo.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.mail.yahoo.com"
             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">
         <imap
             host="posteo.de"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="posteo.de"
             port="465"
@@ -63,7 +68,8 @@
         link="https://www.free.fr/assistance/597.html">
         <imap
             host="imap.free.fr"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.free.fr"
             port="465"
@@ -74,7 +80,8 @@
         link="https://www.fastmail.com/help/technical/servernamesandports.html">
         <imap
             host="imap.fastmail.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.fastmail.com"
             port="465"
@@ -86,7 +93,8 @@
         link="https://assistance.sfr.fr/service-et-accessoire/sfr-mail/serveurs-messagerie-sfr.html">
         <imap
             host="imap.sfr.fr"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.sfr.fr"
             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">
         <imap
             host="mail.infomaniak.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="mail.infomaniak.com"
             port="587"
@@ -106,7 +115,8 @@
     <provider name="OVH.net">
         <imap
             host="ssl0.ovh.net"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="ssl0.ovh.net"
             port="465"
@@ -117,7 +127,8 @@
         link="https://support.gmx.com/pop-imap/imap/index.html#breadcrumb_help_pop-imap_imap_server">
         <imap
             host="imap.gmx.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="mail.gmx.com"
             port="587"
@@ -126,7 +137,8 @@
     <provider name="disroot.org">
         <imap
             host="disroot.org"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="disroot.org"
             port="587"
@@ -137,7 +149,8 @@
         link="https://mail.de/hilfe/pop3-imap-einstellungen">
         <imap
             host="imap.mail.de"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.mail.de"
             port="465"
@@ -148,7 +161,8 @@
         link="https://yandex.com/support/mail/mail-clients.html#imap">
         <imap
             host="imap.yandex.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.yandex.com"
             port="465"
@@ -159,7 +173,8 @@
         link="https://hilfe.web.de/pop-imap/imap/imap-serverdaten.html">
         <imap
             host="imap.web.de"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.web.de"
             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">
         <imap
             host="imap.telstra.com"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.telstra.com"
             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">
         <imap
             host="secureimap.t-online.de"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="securesmtp.t-online.de"
             port="465"
@@ -192,7 +209,8 @@
         link="https://hilfe.webmailer.1und1.de/mailprogramme/imap.html">
         <imap
             host="imap.1und1.de"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.1und1.de"
             port="465"
@@ -203,7 +221,8 @@
         link="https://dismail.de/info.html">
         <imap
             host="imap.dismail.de"
-            port="993" />
+            port="993"
+            starttls="false" />
         <smtp
             host="smtp.dismail.de"
             port="465"