From 6ff234f9715c2227e65ea6ba4e6e7176494f7f43 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 25 Oct 2021 10:01:01 +0200 Subject: [PATCH] Small improvement --- app/src/main/java/eu/faircode/email/Core.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 401e43911d..6dd43d0c7a 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1575,7 +1575,6 @@ class Core { try { List deleted = new ArrayList<>(); - boolean found = false; if (message.uid != null) { Message iexisting = ifolder.getMessageByUID(message.uid); if (iexisting == null) @@ -1587,15 +1586,13 @@ class Core { iexisting.setFlag(Flags.Flag.DELETED, true); else iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted); - - found = true; - if (perform_expunge || message.ui_deleted) - deleted.add(iexisting); + deleted.add(iexisting); } catch (MessageRemovedException ignored) { Log.w(folder.name + " existing gone uid=" + message.uid); } } + boolean found = (deleted.size() > 0); if (!TextUtils.isEmpty(message.msgid) && (!found || EntityFolder.DRAFTS.equals(folder.type))) try { @@ -1619,8 +1616,7 @@ class Core { else iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted); - if (perform_expunge || message.ui_deleted) - deleted.add(iexisting); + deleted.add(iexisting); } catch (MessageRemovedException ignored) { Log.w(folder.name + " existing gone uid=" + muid); }