From 157efba57ff12939422c378dd6b8ec54fa43066b Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 23 Feb 2021 15:59:15 +0100 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/Core.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 1e56d8b1e5..5bce2b5552 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1368,7 +1368,7 @@ class Core { } try { - boolean found = false; + boolean deleted = false; if (message.uid != null) { Message iexisting = ifolder.getMessageByUID(message.uid); @@ -1381,13 +1381,13 @@ class Core { iexisting.setFlag(Flags.Flag.DELETED, true); else iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted); - found = true; + deleted = true; } catch (MessageRemovedException ignored) { Log.w(folder.name + " existing gone uid=" + message.uid); } } - if (!found && !TextUtils.isEmpty(message.msgid)) + if (!deleted && !TextUtils.isEmpty(message.msgid)) try { Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid)); if (imessages == null) @@ -1401,7 +1401,7 @@ class Core { iexisting.setFlag(Flags.Flag.DELETED, true); else iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted); - found = true; + deleted = true; } catch (MessageRemovedException ignored) { Log.w(folder.name + " existing gone uid=" + muid); } @@ -1411,11 +1411,11 @@ class Core { } if (perform_expunge) { - if (found) + if (deleted) ifolder.expunge(); // NO EXPUNGE failed. db.message().deleteMessage(message.id); } else { - if (found) + if (deleted) db.message().setMessageDeleted(message.id, message.ui_deleted); }