mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-21 23:32:51 +00:00
Code Issues Releases Wiki Activity

Improved fallback search by msgid

Browse source
This commit is contained in:
M66B 2024-12-02 09:13:12 +01:00
parent 24ffa5abfd
commit 7a2b37bdb3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/Core.java
View file

@ -114,6 +114,7 @@ import javax.mail.internet.ContentType;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.search.AndTerm;
import javax.mail.search.ComparisonTerm;
import javax.mail.search.FlagTerm;
import javax.mail.search.HeaderTerm;
@ -868,15 +869,26 @@ class Core {
private static Message[] findMsgId(Context context, EntityAccount account, IMAPFolder ifolder, String msgid, Long from) throws MessagingException, IOException {
// https://stackoverflow.com/questions/18891509/how-to-get-message-from-messageidterm-for-yahoo-imap-profile
if (account.isYahooJp() || from != null) {
if (from == null)
from = new Date().getTime();
from -= 24 * 3600 * 1000L;
long to = from + 3 * 24 * 3600 * 1000L;
Message[] itemps = ifolder.search(
new ReceivedDateTerm(ComparisonTerm.GE,
from == null ? new Date() : new Date(from)));
new AndTerm(
new ReceivedDateTerm(ComparisonTerm.GE, new Date(from)),
new ReceivedDateTerm(ComparisonTerm.LE, new Date(to))));
List<Message> tmp = new ArrayList<>();
for (Message itemp : itemps) {
MessageHelper helper = new MessageHelper((MimeMessage) itemp, context);
if (msgid.equals(helper.getMessageID()))
tmp.add(itemp);
}
Log.w("Fallback search by" +
" msgid=" + msgid +
" host=" + account.host +
" from=" + new Date(from) + " to=" + new Date(to) +
" found=" + tmp.size());
return tmp.toArray(new Message[0]);
} else
return ifolder.search(new MessageIDTerm(msgid));