mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved move operation handling

This commit is contained in:
M66B 2022-10-11 08:02:21 +02:00
parent 7b20416f62
commit 76052e1560
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@ -274,32 +274,36 @@ public class EntityOperation {
boolean premove = true; boolean premove = true;
if (source.account.equals(target.account)) { if (source.account.equals(target.account)) {
EntityAccount account = db.account().getAccount(message.account); EntityAccount account = db.account().getAccount(message.account);
if ((account != null && !account.isGmail()) ||
!EntityFolder.ARCHIVE.equals(source.type) ||
EntityFolder.TRASH.equals(target.type) || EntityFolder.JUNK.equals(target.type))
if (!message.ui_deleted)
db.message().setMessageUiHide(message.id, true);
if (account != null && account.isGmail()) { if (account != null && account.isGmail()) {
if (EntityFolder.ARCHIVE.equals(source.type) && if (EntityFolder.ARCHIVE.equals(source.type) &&
!(EntityFolder.SENT.equals(target.type) || !(EntityFolder.SENT.equals(target.type) ||
EntityFolder.TRASH.equals(target.type) || EntityFolder.TRASH.equals(target.type) ||
EntityFolder.JUNK.equals(target.type))) EntityFolder.JUNK.equals(target.type)))
name = COPY; name = COPY;
else {
Log.i("Move: hide source=" + message.id);
if (!message.ui_deleted)
db.message().setMessageUiHide(message.id, true);
}
if (!TextUtils.isEmpty(message.msgid) && !TextUtils.isEmpty(message.hash) && if (!TextUtils.isEmpty(message.msgid) && !TextUtils.isEmpty(message.hash) &&
(EntityFolder.SENT.equals(target.type) || (EntityFolder.SENT.equals(target.type) ||
EntityFolder.TRASH.equals(target.type) || EntityFolder.TRASH.equals(target.type) ||
EntityFolder.JUNK.equals(target.type))) { EntityFolder.JUNK.equals(target.type))) {
EntityMessage archived = db.message().getMessage(message.account, EntityFolder.ARCHIVE, message.msgid); EntityMessage archived = db.message().getMessage(message.account, EntityFolder.ARCHIVE, message.msgid);
if (archived != null && message.hash.equals(archived.hash)) if (archived != null && message.hash.equals(archived.hash)) {
Log.i("Move: hide archived=" + archived.id);
db.message().setMessageUiHide(archived.id, true); db.message().setMessageUiHide(archived.id, true);
}
} }
}
if (account != null && account.isGmail() && if (EntityFolder.DRAFTS.equals(source.type) || EntityFolder.DRAFTS.equals(target.type))
(EntityFolder.DRAFTS.equals(source.type) || EntityFolder.DRAFTS.equals(target.type))) premove = false;
premove = false; } else {
Log.i("Move: hide other=" + message.id);
if (!message.ui_deleted)
db.message().setMessageUiHide(message.id, true);
}
} }
if (message.ui_snoozed != null && if (message.ui_snoozed != null &&