Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 20:06:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pick first auto config server

Browse Source
This commit is contained in:
M66B
2025-03-21 20:49:09 +01:00
parent 1fa2846ebe
commit c8c8125fd3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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