pull/199/head 1.1633
M66B 4 years ago
parent bdb43f3b92
commit 47044d126f

@ -1318,9 +1318,9 @@ class Core {
if (uid == null) if (uid == null)
throw new IllegalArgumentException("move: uid not found"); throw new IllegalArgumentException("move: uid not found");
if (draft) { if (draft || duplicate) {
Message icopy = itarget.getMessageByUID(uid); Message icopy = itarget.getMessageByUID(uid);
if (icopy != null) if (icopy == null)
throw new IllegalArgumentException("move: gone uid=" + uid); throw new IllegalArgumentException("move: gone uid=" + uid);
// Mark read // Mark read

@ -196,9 +196,6 @@ public class EntityOperation {
jargs.remove(2); jargs.remove(2);
} }
jargs.put(1, autoread);
jargs.put(3, autounflag);
EntityFolder source = db.folder().getFolder(message.folder); EntityFolder source = db.folder().getFolder(message.folder);
EntityFolder target = db.folder().getFolder(jargs.getLong(0)); EntityFolder target = db.folder().getFolder(jargs.getLong(0));
if (source == null || target == null || source.id.equals(target.id)) if (source == null || target == null || source.id.equals(target.id))
@ -208,6 +205,9 @@ public class EntityOperation {
EntityFolder.TRASH.equals(target.type)) EntityFolder.TRASH.equals(target.type))
autoread = true; autoread = true;
jargs.put(1, autoread);
jargs.put(3, autounflag);
EntityLog.log(context, "Move message=" + message.id + EntityLog.log(context, "Move message=" + message.id +
"@" + new Date(message.received) + "@" + new Date(message.received) +
":" + message.subject + ":" + message.subject +

Loading…
Cancel
Save