mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 14:41:08 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2021-02-23 15:59:15 +01:00
parent d21826b620
commit 157efba57f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/Core.java
View file

@ -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);
}