From 8d22039163d6f11ece856dae0f0c2538c7686300 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 19 Jul 2023 19:39:13 +0200 Subject: [PATCH] Simplification --- app/src/main/java/eu/faircode/email/Core.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index f640058691..4e7d7d94c8 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2258,24 +2258,14 @@ class Core { throw new IllegalArgumentException("exists without msgid"); // Search for message - Message[] imessages = (account.isOutlook()) - ? ifolder.search(new HeaderTerm("X-Microsoft-Original-Message-ID", message.msgid)) - : ifolder.search(new MessageIDTerm(message.msgid)); + // Alternative, inconsistent for Outlook: X-Microsoft-Original-Message-ID + Message[] imessages = ifolder.search(account.isOutlook() + ? new HeaderTerm(MessageHelper.HEADER_CORRELATION_ID, message.msgid) + : new MessageIDTerm(message.msgid)); - // Fallback - if (account.isOutlook()) - 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? - } + // Searching for random header: + // 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)