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

Show source message on failure on cross account move

This commit is contained in:
M66B 2021-03-11 08:05:41 +01:00
parent bb68824e28
commit f912c9346f
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1025,28 +1025,39 @@ class Core {
Log.e(ex);
}
} else {
// Lookup added messages
Long found = findUid(context, ifolder, message.msgid, false);
if (found == null) {
String msg = "Added message not found msgid=" + message.msgid;
Log.e(msg);
throw new IllegalArgumentException(msg);
}
try {
Log.i(folder.name + " Fetching uid=" + found);
JSONArray fargs = new JSONArray();
fargs.put(found);
onFetch(context, fargs, folder, istore, ifolder, state);
} catch (Throwable ex) {
Log.e(ex);
db.beginTransaction();
if (found == null) {
db.message().setMessageError(message.id, "Message not found in target folder");
db.message().setMessageUiHide(message.id, false);
} else {
// Mark source read
if (autoread)
EntityOperation.queue(context, message, EntityOperation.SEEN, true);
// Delete source
EntityOperation.queue(context, message, EntityOperation.DELETE);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
// Mark source read
if (autoread)
EntityOperation.queue(context, message, EntityOperation.SEEN, true);
// Delete source
EntityOperation.queue(context, message, EntityOperation.DELETE);
// Fetch target
if (found != null)
try {
Log.i(folder.name + " Fetching uid=" + found);
JSONArray fargs = new JSONArray();
fargs.put(found);
onFetch(context, fargs, folder, istore, ifolder, state);
} catch (Throwable ex) {
Log.e(ex);
}
}
}