TF-1626 Remove id of email when call Email/set method

(cherry picked from commit ce1d27d893fd406aa812d4e4ea9debe1ec265ddb)
This commit is contained in:
dab246
2023-03-21 18:27:48 +07:00
committed by Dat Vu
parent 61a9414fe1
commit 0d77789c5f
19 changed files with 120 additions and 106 deletions
@@ -56,7 +56,7 @@ mixin EmailActionController on ViewAsDialogActionMixin {
if (mailboxContain != null && accountId != null && trashMailboxId != null) {
_moveToTrashAction(accountId, MoveToMailboxRequest(
{mailboxContain.id: [email.id]},
{mailboxContain.id: email.id != null ? [email.id!] : []},
trashMailboxId,
MoveAction.moving,
mailboxDashBoardController.sessionCurrent!,
@@ -75,7 +75,7 @@ mixin EmailActionController on ViewAsDialogActionMixin {
if (mailboxContain != null && accountId != null && spamMailboxId != null) {
moveToSpamAction(accountId, MoveToMailboxRequest(
{mailboxContain.id: [email.id]},
{mailboxContain.id: email.id != null ? [email.id!] : []},
spamMailboxId,
MoveAction.moving,
mailboxDashBoardController.sessionCurrent!,
@@ -91,7 +91,7 @@ mixin EmailActionController on ViewAsDialogActionMixin {
if (inboxMailboxId != null && accountId != null && spamMailboxId != null) {
moveToSpamAction(accountId, MoveToMailboxRequest(
{spamMailboxId: [email.id]},
{spamMailboxId: email.id != null ? [email.id!] : []},
inboxMailboxId,
MoveAction.moving,
mailboxDashBoardController.sessionCurrent!,
@@ -161,21 +161,21 @@ mixin EmailActionController on ViewAsDialogActionMixin {
) {
if (destinationMailbox.isTrash) {
moveToSpamAction(accountId, MoveToMailboxRequest(
{currentMailbox.id: [emailSelected.id]},
{currentMailbox.id: emailSelected.id != null ? [emailSelected.id!] : []},
destinationMailbox.id,
MoveAction.moving,
session,
EmailActionType.moveToTrash));
} else if (destinationMailbox.isSpam) {
moveToSpamAction(accountId, MoveToMailboxRequest(
{currentMailbox.id: [emailSelected.id]},
{currentMailbox.id: emailSelected.id != null ? [emailSelected.id!] : []},
destinationMailbox.id,
MoveAction.moving,
session,
EmailActionType.moveToSpam));
} else {
_moveToMailboxAction(accountId, MoveToMailboxRequest(
{currentMailbox.id: [emailSelected.id]},
{currentMailbox.id: emailSelected.id != null ? [emailSelected.id!] : []},
destinationMailbox.id,
MoveAction.moving,
session,
@@ -887,8 +887,8 @@ class ThreadController extends BaseController with EmailActionController {
}
void calculateDragValue(PresentationEmail? currentPresentationEmail) {
if(currentPresentationEmail != null) {
if(mailboxDashBoardController.listEmailSelected.findEmail(currentPresentationEmail.id) != null){
if (currentPresentationEmail != null) {
if (currentPresentationEmail.id != null && mailboxDashBoardController.listEmailSelected.findEmail(currentPresentationEmail.id!) != null){
listEmailDrag.clear();
listEmailDrag.addAll(mailboxDashBoardController.listEmailSelected);
} else {