|
|
@ -1051,8 +1051,10 @@ class Core {
|
|
|
|
// Delete message
|
|
|
|
// Delete message
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
|
|
|
|
|
|
|
|
if (!account.leave_deleted &&
|
|
|
|
if (EntityFolder.INBOX.equals(folder.type)) {
|
|
|
|
EntityFolder.INBOX.equals(folder.type)) {
|
|
|
|
if (account.leave_deleted)
|
|
|
|
|
|
|
|
db.message().setMessageUiHide(message.id, true);
|
|
|
|
|
|
|
|
else {
|
|
|
|
Map<String, String> caps = istore.capabilities();
|
|
|
|
Map<String, String> caps = istore.capabilities();
|
|
|
|
|
|
|
|
|
|
|
|
Message[] imessages = ifolder.getMessages();
|
|
|
|
Message[] imessages = ifolder.getMessages();
|
|
|
@ -1090,10 +1092,9 @@ class Core {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
db.message().deleteMessage(folder.id, message.id);
|
|
|
|
db.message().deleteMessage(folder.id, message.id);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
if (!EntityFolder.INBOX.equals(folder.type))
|
|
|
|
|
|
|
|
db.message().deleteMessage(folder.id, message.id);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else
|
|
|
|
|
|
|
|
db.message().deleteMessage(folder.id, message.id);
|
|
|
|
|
|
|
|
|
|
|
|
if (!EntityFolder.DRAFTS.equals(folder.type) &&
|
|
|
|
if (!EntityFolder.DRAFTS.equals(folder.type) &&
|
|
|
|
!EntityFolder.TRASH.equals(folder.type)) {
|
|
|
|
!EntityFolder.TRASH.equals(folder.type)) {
|
|
|
|