mirror of https://github.com/M66B/FairEmail.git
Small improvement
This commit is contained in:
parent
b46b85f621
commit
6c629c1349
|
@ -191,12 +191,13 @@ class Core {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EntityOperation.MOVE:
|
case EntityOperation.MOVE:
|
||||||
if (EntityOperation.MOVE.equals(next.name)) {
|
if (message.uid != null &&
|
||||||
|
EntityOperation.MOVE.equals(next.name)) {
|
||||||
JSONArray jnext = new JSONArray(next.args);
|
JSONArray jnext = new JSONArray(next.args);
|
||||||
// Same target
|
// Same target
|
||||||
if (jargs.getLong(0) == jnext.getLong(0)) {
|
if (jargs.getLong(0) == jnext.getLong(0)) {
|
||||||
EntityMessage m = db.message().getMessage(next.message);
|
EntityMessage m = db.message().getMessage(next.message);
|
||||||
if (m != null) {
|
if (m != null && m.uid != null) {
|
||||||
processed.add(next.id);
|
processed.add(next.id);
|
||||||
similar.put(next, m);
|
similar.put(next, m);
|
||||||
}
|
}
|
||||||
|
@ -792,7 +793,7 @@ class Core {
|
||||||
for (EntityMessage message : messages)
|
for (EntityMessage message : messages)
|
||||||
try {
|
try {
|
||||||
if (message.uid == null)
|
if (message.uid == null)
|
||||||
throw new MessageRemovedException("move without uid");
|
throw new IllegalArgumentException("move without uid");
|
||||||
Message imessage = ifolder.getMessageByUID(message.uid);
|
Message imessage = ifolder.getMessageByUID(message.uid);
|
||||||
if (imessage == null)
|
if (imessage == null)
|
||||||
throw new MessageRemovedException("move without message");
|
throw new MessageRemovedException("move without message");
|
||||||
|
|
Loading…
Reference in New Issue