mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplified looking up sent messages

This commit is contained in:
M66B 2023-06-14 22:30:40 +02:00
parent 829694a64e
commit e67efaae3e
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2155,18 +2155,24 @@ class Core {
throw new IllegalArgumentException("exists without msgid");
// Search for message
Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
if (imessages == null || imessages.length == 0)
try {
// Needed for Outlook
imessages = ifolder.search(
new AndTerm(
new SentDateTerm(ComparisonTerm.GE, new Date()),
new HeaderTerm(MessageHelper.HEADER_CORRELATION_ID, message.msgid)));
} catch (Throwable ex) {
Log.e(ex);
// Seznam: Jakarta Mail Exception: java.io.IOException: Connection dropped by server?
}
Message[] imessages = (account.isOutlook())
? ifolder.search(new HeaderTerm("X-Microsoft-Original-Message-ID", message.msgid))
: ifolder.search(new MessageIDTerm(message.msgid));
// Fallback
if (false)
if (imessages == null || imessages.length == 0)
try {
// Needed for Outlook
imessages = ifolder.search(
new AndTerm(
new SentDateTerm(ComparisonTerm.GE, new Date()),
new HeaderTerm(MessageHelper.HEADER_CORRELATION_ID, message.msgid)));
} catch (Throwable ex) {
Log.e(ex);
// iCloud: NO [UNAVAILABLE] Unexpected exception
// Seznam: Jakarta Mail Exception: java.io.IOException: Connection dropped by server?
}
// Some email servers are slow with adding sent messages
if (retry)

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

@ -208,6 +208,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
return "imap.aol.com".equalsIgnoreCase(host);
}
boolean isICloud() {
return "imap.mail.me.com".equalsIgnoreCase(host);
}
boolean isTransient(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean enabled = prefs.getBoolean("enabled", true);