From 31d643c5448ade9ec866e2566a18fb962c259578 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:59:37 +0100
Subject: [PATCH] Prevent collapsing fetch/delete

---
 app/src/main/java/eu/faircode/email/Core.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index a1887c1df2..ba05ac799d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -263,8 +263,9 @@ class Core {
                                 case EntityOperation.FETCH:
                                     if (EntityOperation.FETCH.equals(next.name)) {
                                         JSONArray jnext = new JSONArray(next.args);
-                                        // Same uid
-                                        if (jargs.getLong(0) == jnext.getLong(0))
+                                        // Same uid, delete flag
+                                        if (jargs.getLong(0) == jnext.getLong(0) &&
+                                                jargs.optBoolean(1) == jnext.optBoolean(1))
                                             skip = true;
                                     }
                                     break;