From 780751034ab70acdc5c207401dc8addab2c97837 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 7 Nov 2023 19:08:52 +0700 Subject: [PATCH] TF-2302 Fix show folder Signed-off-by: dab246 (cherry picked from commit 221f26feefea1e42ecad72dc0eb2fe9471d683a9) --- .../presentation/mailbox_controller.dart | 15 ++++++++--- .../mailbox_visibility_controller.dart | 26 +++++++++++++++---- .../search_mailbox_controller.dart | 15 ++++++++--- 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart index 593948ba7..5334f6742 100644 --- a/lib/features/mailbox/presentation/mailbox_controller.dart +++ b/lib/features/mailbox/presentation/mailbox_controller.dart @@ -1117,7 +1117,10 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM } } - _refreshMailboxChanges(currentMailboxState: success.currentMailboxState); + _refreshMailboxChanges( + currentMailboxState: success.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _handleUnsubscribeMultipleMailboxAllSuccess(SubscribeMultipleMailboxAllSuccess success) { @@ -1133,7 +1136,10 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM } } - _refreshMailboxChanges(currentMailboxState: success.currentMailboxState); + _refreshMailboxChanges( + currentMailboxState: success.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _handleUnsubscribeMultipleMailboxHasSomeSuccess(SubscribeMultipleMailboxHasSomeSuccess success) { @@ -1149,7 +1155,10 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM } } - _refreshMailboxChanges(currentMailboxState: success.currentMailboxState); + _refreshMailboxChanges( + currentMailboxState: success.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _closeEmailViewIfMailboxDisabledOrNotExist(List mailboxIdsDisabled) { diff --git a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart index e301d6431..3c4e654ab 100644 --- a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart +++ b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart @@ -7,12 +7,14 @@ import 'package:dartz/dartz.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; +import 'package:jmap_dart_client/jmap/core/properties/properties.dart'; import 'package:jmap_dart_client/jmap/core/state.dart' as jmap; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:model/extensions/presentation_mailbox_extension.dart'; import 'package:model/mailbox/expand_mode.dart'; import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart'; +import 'package:tmail_ui_user/features/mailbox/domain/constants/mailbox_constants.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_subscribe_action_state.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_subscribe_state.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/subscribe_mailbox_request.dart'; @@ -166,7 +168,10 @@ class MailboxVisibilityController extends BaseMailboxController { _showToastSubscribeMailboxSuccess(subscribeMailboxSuccess.mailboxId); } - _refreshMailboxChanges(subscribeMailboxSuccess.currentMailboxState); + _refreshMailboxChanges( + newMailboxState: subscribeMailboxSuccess.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _handleUnsubscribeMultipleMailboxHasSomeSuccess(SubscribeMultipleMailboxHasSomeSuccess subscribeMailboxSuccess) { @@ -177,7 +182,10 @@ class MailboxVisibilityController extends BaseMailboxController { ); } - _refreshMailboxChanges(subscribeMailboxSuccess.currentMailboxState); + _refreshMailboxChanges( + newMailboxState: subscribeMailboxSuccess.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _handleUnsubscribeMultipleMailboxAllSuccess(SubscribeMultipleMailboxAllSuccess subscribeMailboxSuccess) { @@ -188,15 +196,23 @@ class MailboxVisibilityController extends BaseMailboxController { ); } - _refreshMailboxChanges(subscribeMailboxSuccess.currentMailboxState); + _refreshMailboxChanges( + newMailboxState: subscribeMailboxSuccess.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } - void _refreshMailboxChanges(jmap.State? newMailboxState) { + void _refreshMailboxChanges({jmap.State? newMailboxState, Properties? properties}) { final session = _accountDashBoardController.sessionCurrent; final accountId = _accountDashBoardController.accountId.value; final mailboxState = newMailboxState ?? currentMailboxState; if (session != null && accountId != null && mailboxState != null) { - refreshMailboxChanges(session, accountId, mailboxState); + refreshMailboxChanges( + session, + accountId, + mailboxState, + properties: properties + ); } } diff --git a/lib/features/search/mailbox/presentation/search_mailbox_controller.dart b/lib/features/search/mailbox/presentation/search_mailbox_controller.dart index 5e65df6e6..938f10b14 100644 --- a/lib/features/search/mailbox/presentation/search_mailbox_controller.dart +++ b/lib/features/search/mailbox/presentation/search_mailbox_controller.dart @@ -509,7 +509,10 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa } } - _refreshMailboxChanges(mailboxState: success.currentMailboxState); + _refreshMailboxChanges( + mailboxState: success.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _handleSubscribeMultipleMailboxAllSuccess(SubscribeMultipleMailboxAllSuccess success) { @@ -527,7 +530,10 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa } } - _refreshMailboxChanges(mailboxState: success.currentMailboxState); + _refreshMailboxChanges( + mailboxState: success.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _handleSubscribeMultipleMailboxHasSomeSuccess(SubscribeMultipleMailboxHasSomeSuccess success) { @@ -545,7 +551,10 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa } } - _refreshMailboxChanges(mailboxState: success.currentMailboxState); + _refreshMailboxChanges( + mailboxState: success.currentMailboxState, + properties: MailboxConstants.propertiesDefault + ); } void _showToastSubscribeMailboxSuccess(