Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-27 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace email provider config

Browse Source
This commit is contained in:
M66B
2025-02-11 08:13:53 +01:00
parent 2276c8476a
commit 67eaf1d933
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,7 +570,7 @@ public class EmailProvider implements Parcelable {
if (candidates.size() == 0)
throw new UnknownHostException(context.getString(R.string.title_setup_no_settings, domain));
for (EmailProvider candidate : candidates) {
for (EmailProvider candidate : new ArrayList<>(candidates)) {
// Always prefer built-in profiles
// - ISPDB is not always correct
// - documentation links
@@ -579,13 +579,21 @@ public class EmailProvider implements Parcelable {
provider.imap.host.equals(candidate.imap.host) ||
provider.smtp.host.equals(candidate.smtp.host)) {
EntityLog.log(context, "Replacing auto config host by profile=" + provider.name);
return Arrays.asList(provider);
EmailProvider copy = provider.copy();
copy.imap.score = candidate.imap.score;
copy.smtp.score = candidate.smtp.score;
candidates.add(copy);
candidates.remove(candidate);
} else if (provider.enabled && provider.mx != null)
for (String mx : provider.mx)
if ((candidate.imap.host != null && candidate.imap.host.matches(mx)) ||
(candidate.smtp.host != null && candidate.smtp.host.matches(mx))) {
EntityLog.log(context, "Replacing auto config MC by profile=" + provider.name);
return Arrays.asList(provider);
EntityLog.log(context, "Replacing auto config MX by profile=" + provider.name);
EmailProvider copy = provider.copy();
copy.imap.score = candidate.imap.score;
copy.smtp.score = candidate.smtp.score;
candidates.add(copy);
candidates.remove(candidate);
}
// https://help.dreamhost.com/hc/en-us/articles/214918038-Email-client-configuration-overview
@@ -1352,6 +1360,20 @@ public class EmailProvider implements Parcelable {
return Objects.hash(imap, smtp);
}
public EmailProvider copy() {
Parcel parcel = null;
try {
parcel = Parcel.obtain();
this.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
return EmailProvider.CREATOR.createFromParcel(parcel);
} finally {
if (parcel != null) {
parcel.recycle();
}
}
}
@NonNull
@Override
public String toString() {