Small improvement

pull/194/merge
M66B 3 years ago
parent 08cdba4caa
commit 6ff234f971

@ -1575,7 +1575,6 @@ class Core {
try { try {
List<Message> deleted = new ArrayList<>(); List<Message> deleted = new ArrayList<>();
boolean found = false;
if (message.uid != null) { if (message.uid != null) {
Message iexisting = ifolder.getMessageByUID(message.uid); Message iexisting = ifolder.getMessageByUID(message.uid);
if (iexisting == null) if (iexisting == null)
@ -1587,15 +1586,13 @@ class Core {
iexisting.setFlag(Flags.Flag.DELETED, true); iexisting.setFlag(Flags.Flag.DELETED, true);
else else
iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted); iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted);
deleted.add(iexisting);
found = true;
if (perform_expunge || message.ui_deleted)
deleted.add(iexisting);
} catch (MessageRemovedException ignored) { } catch (MessageRemovedException ignored) {
Log.w(folder.name + " existing gone uid=" + message.uid); Log.w(folder.name + " existing gone uid=" + message.uid);
} }
} }
boolean found = (deleted.size() > 0);
if (!TextUtils.isEmpty(message.msgid) && if (!TextUtils.isEmpty(message.msgid) &&
(!found || EntityFolder.DRAFTS.equals(folder.type))) (!found || EntityFolder.DRAFTS.equals(folder.type)))
try { try {
@ -1619,8 +1616,7 @@ class Core {
else else
iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted); iexisting.setFlag(Flags.Flag.DELETED, message.ui_deleted);
if (perform_expunge || message.ui_deleted) deleted.add(iexisting);
deleted.add(iexisting);
} catch (MessageRemovedException ignored) { } catch (MessageRemovedException ignored) {
Log.w(folder.name + " existing gone uid=" + muid); Log.w(folder.name + " existing gone uid=" + muid);
} }

Loading…
Cancel
Save