mirror of
https://github.com/M66B/FairEmail.git
synced 2025-02-28 16:55:56 +00:00
Skip ensuring uid on delete
This commit is contained in:
parent
ce9b7e82e2
commit
3309dd5f7d
1 changed files with 4 additions and 1 deletions
|
@ -193,7 +193,8 @@ class Core {
|
||||||
EntityOperation next = ops.get(j);
|
EntityOperation next = ops.get(j);
|
||||||
if (next.message != null &&
|
if (next.message != null &&
|
||||||
next.message.equals(op.message) &&
|
next.message.equals(op.message) &&
|
||||||
EntityOperation.ADD.equals(next.name)) {
|
(EntityOperation.ADD.equals(next.name) ||
|
||||||
|
EntityOperation.DELETE.equals(next.name))) {
|
||||||
squash = true;
|
squash = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -315,6 +316,8 @@ class Core {
|
||||||
return;
|
return;
|
||||||
if (EntityOperation.ADD.equals(op.name))
|
if (EntityOperation.ADD.equals(op.name))
|
||||||
return;
|
return;
|
||||||
|
if (EntityOperation.DELETE.equals(op.name) && !TextUtils.isEmpty(message.msgid))
|
||||||
|
return;
|
||||||
|
|
||||||
Log.i(folder.name + " ensure uid op=" + op.name + " msgid=" + message.msgid);
|
Log.i(folder.name + " ensure uid op=" + op.name + " msgid=" + message.msgid);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue