mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-22 07:42:52 +00:00
Code Issues Releases Wiki Activity

Find message fallback

Browse source
This commit is contained in:
M66B 2024-12-01 12:12:47 +01:00
parent 1e8c119170
commit 24ffa5abfd
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -818,7 +818,7 @@ class Core {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
Long uid = findUid(context, account, ifolder, message.msgid); Long uid = findUid(context, account, ifolder, message.msgid, null);
if (uid == null) { if (uid == null) {
if (EntityOperation.MOVE.equals(op.name) && if (EntityOperation.MOVE.equals(op.name) &&
EntityFolder.DRAFTS.equals(folder.type)) EntityFolder.DRAFTS.equals(folder.type))
@ -840,13 +840,13 @@ class Core {
message.uid = uid; message.uid = uid;
} }
private static Long findUid(Context context, EntityAccount account, IMAPFolder ifolder, String msgid) throws MessagingException, IOException { private static Long findUid(Context context, EntityAccount account, IMAPFolder ifolder, String msgid, Long from) throws MessagingException, IOException {
String name = ifolder.getFullName(); String name = ifolder.getFullName();
Log.i(name + " searching for msgid=" + msgid); Log.i(name + " searching for msgid=" + msgid);
Long uid = null; Long uid = null;
Message[] imessages = findMsgId(context, account, ifolder, msgid); Message[] imessages = findMsgId(context, account, ifolder, msgid, from);
if (imessages != null) if (imessages != null)
for (Message iexisting : imessages) for (Message iexisting : imessages)
try { try {
@ -865,10 +865,12 @@ class Core {
return uid; return uid;
} }
private static Message[] findMsgId(Context context, EntityAccount account, IMAPFolder ifolder, String msgid) throws MessagingException, IOException { 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 // https://stackoverflow.com/questions/18891509/how-to-get-message-from-messageidterm-for-yahoo-imap-profile
if (account.isYahooJp()) { if (account.isYahooJp() || from != null) {
Message[] itemps = ifolder.search(new ReceivedDateTerm(ComparisonTerm.GE, new Date())); Message[] itemps = ifolder.search(
new ReceivedDateTerm(ComparisonTerm.GE,
from == null ? new Date() : new Date(from)));
List<Message> tmp = new ArrayList<>(); List<Message> tmp = new ArrayList<>();
for (Message itemp : itemps) { for (Message itemp : itemps) {
MessageHelper helper = new MessageHelper((MimeMessage) itemp, context); MessageHelper helper = new MessageHelper((MimeMessage) itemp, context);
@ -1298,7 +1300,7 @@ class Core {
} }
Log.i(folder.name + " searching for added msgid=" + message.msgid); Log.i(folder.name + " searching for added msgid=" + message.msgid);
Message[] imessages = findMsgId(context, account, ifolder, message.msgid); Message[] imessages = findMsgId(context, account, ifolder, message.msgid, null);
if (imessages != null) { if (imessages != null) {
Long found = newuid; Long found = newuid;
@ -1357,7 +1359,7 @@ class Core {
int count = 0; int count = 0;
Long found = newuid; Long found = newuid;
while (found == null && count++ < FIND_RETRY_COUNT) { while (found == null && count++ < FIND_RETRY_COUNT) {
found = findUid(context, account, ifolder, message.msgid); found = findUid(context, account, ifolder, message.msgid, count > 1 ? message.received : null);
if (found == null) if (found == null)
try { try {
Thread.sleep(FIND_RETRY_DELAY); Thread.sleep(FIND_RETRY_DELAY);
@ -1371,7 +1373,7 @@ class Core {
if (found == null) { if (found == null) {
db.message().setMessageError(message.id, db.message().setMessageError(message.id,
"Message not found in target folder " + account.name + "/" + folder.name); "Message not found in target folder " + account.name + "/" + folder.name + " msgid=" + message.msgid);
db.message().setMessageUiHide(message.id, false); db.message().setMessageUiHide(message.id, false);
} else { } else {
// Mark source read // Mark source read
@ -1613,7 +1615,7 @@ class Core {
if (TextUtils.isEmpty(msgid)) if (TextUtils.isEmpty(msgid))
throw new IllegalArgumentException("move: msgid missing"); throw new IllegalArgumentException("move: msgid missing");
Long uid = findUid(context, account, itarget, msgid); Long uid = findUid(context, account, itarget, msgid, null);
if (uid == null) if (uid == null)
if (duplicate || !EntityFolder.TRASH.equals(folder.type)) if (duplicate || !EntityFolder.TRASH.equals(folder.type))
throw new IllegalArgumentException("move: uid not found"); throw new IllegalArgumentException("move: uid not found");
@ -1929,7 +1931,7 @@ class Core {
if (!TextUtils.isEmpty(message.msgid) && if (!TextUtils.isEmpty(message.msgid) &&
(!found || EntityFolder.DRAFTS.equals(folder.type))) (!found || EntityFolder.DRAFTS.equals(folder.type)))
try { try {
Message[] imessages = findMsgId(context, account, ifolder, message.msgid); Message[] imessages = findMsgId(context, account, ifolder, message.msgid, null);
if (imessages != null) if (imessages != null)
for (Message iexisting : imessages) for (Message iexisting : imessages)
try { try {
@ -2244,7 +2246,7 @@ class Core {
ifolder.appendMessages(new Message[]{icopy}); ifolder.appendMessages(new Message[]{icopy});
Long uid = findUid(context, account, ifolder, msgid); Long uid = findUid(context, account, ifolder, msgid, null);
if (uid != null) { if (uid != null) {
JSONArray fargs = new JSONArray(); JSONArray fargs = new JSONArray();
fargs.put(uid); fargs.put(uid);
@ -3267,7 +3269,7 @@ class Core {
ifolder.appendMessages(new Message[]{icopy}); ifolder.appendMessages(new Message[]{icopy});
Long uid = findUid(context, account, ifolder, msgid); Long uid = findUid(context, account, ifolder, msgid, null);
if (uid != null) { if (uid != null) {
JSONArray fargs = new JSONArray(); JSONArray fargs = new JSONArray();
fargs.put(uid); fargs.put(uid);