TF-1432 Close email view when mailbox deleted

This commit is contained in:
dab246
2023-02-10 18:19:16 +07:00
committed by Dat Vu
parent 3509d146f7
commit 8ad54aca5c
@@ -792,8 +792,9 @@ class MailboxController extends BaseMailboxController {
message: AppLocalizations.of(currentContext!).delete_mailboxes_successfully, message: AppLocalizations.of(currentContext!).delete_mailboxes_successfully,
icon: _imagePaths.icSelected); icon: _imagePaths.icSelected);
} }
if (listMailboxIdDeleted.contains(mailboxDashBoardController.selectedMailbox.value?.id)) { if (listMailboxIdDeleted.contains(selectedMailbox?.id)) {
_switchBackToMailboxDefault(); _switchBackToMailboxDefault();
_closeEmailViewIfMailboxDisabledOrNotExist(listMailboxIdDeleted);
} }
refreshMailboxChanges(currentMailboxState: currentMailboxState); refreshMailboxChanges(currentMailboxState: currentMailboxState);
} }
@@ -1280,7 +1281,7 @@ class MailboxController extends BaseMailboxController {
if (success.mailboxId == selectedMailbox?.id) { if (success.mailboxId == selectedMailbox?.id) {
_switchBackToMailboxDefault(); _switchBackToMailboxDefault();
_closeEmailViewIfMailboxDisabled([success.mailboxId]); _closeEmailViewIfMailboxDisabledOrNotExist([success.mailboxId]);
} }
} }
@@ -1293,7 +1294,7 @@ class MailboxController extends BaseMailboxController {
if (success.mailboxIdsSubscribe.contains(selectedMailbox?.id)) { if (success.mailboxIdsSubscribe.contains(selectedMailbox?.id)) {
_switchBackToMailboxDefault(); _switchBackToMailboxDefault();
_closeEmailViewIfMailboxDisabled(success.mailboxIdsSubscribe); _closeEmailViewIfMailboxDisabledOrNotExist(success.mailboxIdsSubscribe);
} }
} }
@@ -1306,14 +1307,14 @@ class MailboxController extends BaseMailboxController {
if (success.mailboxIdsSubscribe.contains(selectedMailbox?.id)) { if (success.mailboxIdsSubscribe.contains(selectedMailbox?.id)) {
_switchBackToMailboxDefault(); _switchBackToMailboxDefault();
_closeEmailViewIfMailboxDisabled(success.mailboxIdsSubscribe); _closeEmailViewIfMailboxDisabledOrNotExist(success.mailboxIdsSubscribe);
} }
} }
refreshMailboxChanges(currentMailboxState: success.currentMailboxState); refreshMailboxChanges(currentMailboxState: success.currentMailboxState);
} }
void _closeEmailViewIfMailboxDisabled(List<MailboxId> mailboxIdsDisabled) { void _closeEmailViewIfMailboxDisabledOrNotExist(List<MailboxId> mailboxIdsDisabled) {
if (selectedEmail == null) { if (selectedEmail == null) {
return; return;
} }