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

Pick first auto config server

Browse Source
pull/217/head
M66B 6 months ago
parent 1fa2846ebe
commit c8c8125fd3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
app/src/main/java/eu/faircode/email/EmailProvider.java
Unescape View File

@ -736,8 +736,8 @@ public class EmailProvider implements Parcelable {
EntityLog.log(context, "Parsing " + url); EntityLog.log(context, "Parsing " + url);
boolean imap = false; boolean imap = false, hasImap = false;
boolean smtp = false; boolean smtp = false, hasSmtp = false;
String href = null; String href = null;
String title = null; String title = null;
int eventType = xml.getEventType(); int eventType = xml.getEventType();
@ -763,7 +763,7 @@ public class EmailProvider implements Parcelable {
// <authentication>OAuth2</authentication> // <authentication>OAuth2</authentication>
// <authentication>password-cleartext</authentication> // <authentication>password-cleartext</authentication>
// </incomingServer> // </incomingServer>
imap = "imap".equals(xml.getAttributeValue(null, "type")); imap = !hasImap && "imap".equals(xml.getAttributeValue(null, "type"));
} else if ("outgoingServer".equals(name)) { } else if ("outgoingServer".equals(name)) {
// <outgoingServer type="smtp"> // <outgoingServer type="smtp">
@ -774,7 +774,7 @@ public class EmailProvider implements Parcelable {
// <authentication>OAuth2</authentication> // <authentication>OAuth2</authentication>
// <authentication>password-cleartext</authentication> // <authentication>password-cleartext</authentication>
// </outgoingServer> // </outgoingServer>
smtp = "smtp".equals(xml.getAttributeValue(null, "type")); smtp = !hasSmtp && "smtp".equals(xml.getAttributeValue(null, "type"));
} else if ("hostname".equals(name)) { } else if ("hostname".equals(name)) {
eventType = xml.next(); eventType = xml.next();
@ -874,13 +874,13 @@ public class EmailProvider implements Parcelable {
} else if (eventType == XmlPullParser.END_TAG) { } else if (eventType == XmlPullParser.END_TAG) {
String name = xml.getName(); String name = xml.getName();
if ("incomingServer".equals(name)) if ("incomingServer".equals(name)) {
hasImap = true;
imap = false; imap = false;
} else if ("outgoingServer".equals(name)) {
else if ("outgoingServer".equals(name)) hasSmtp = true;
smtp = false; smtp = false;
} else if ("enable".equals(name) || "documentation".equals(name)) {
else if ("enable".equals(name) || "documentation".equals(name)) {
if (href != null) { if (href != null) {
if (title == null) if (title == null)
title = href; title = href;

Write Preview
Loading…
Cancel
Save