TF-2871 Block notification on folders Sent, Outbox, Drafts, Spam and Trash

ios/Podfile.lock

@@ -323,7 +323,7 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 558b1da7d65afeb996fd5c814332f013234ece4e
   FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f
   fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_appauth: 1ce438877bc111c5d8f42da47729909290624886
   flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39
   flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e

ios/TwakeCore/Jmap/JmapClient.swift

@@ -68,6 +68,11 @@ class JmapClient {
                                        accountId: String,
                                        onComplete: @escaping ([Email], [Error]) -> Void) {
         guard hasMoreChanges, let sinceState = currentSinceState else {
+            if !self.totalListEmails.isEmpty {
+                let sortedListEmails = self.sortListEmails(currentListEmails: self.totalListEmails)
+                self.totalListEmails = sortedListEmails
+            }
+            
             return onComplete(self.totalListEmails, self.listErrors)
         }
         
@@ -85,8 +90,7 @@ class JmapClient {
                 if let response = data.parsing(methodName: JmapConstants.EMAIL_GET_METHOD_NAME, methodCallId: "c1") {
                     if let listEmail = response.list, 
                        !listEmail.isEmpty {
-                        let sortedListEmails = self.sortListEmails(currentListEmails: listEmail)
+                        self.totalListEmails.append(contentsOf: listEmail)
-                        self.totalListEmails.append(contentsOf: sortedListEmails)
                     }
                     self.hasMoreChanges = response.hasMoreChanges ?? false
                     self.currentSinceState = response.newState
@@ -97,6 +101,11 @@ class JmapClient {
                     self.hasMoreChanges = false
                     self.currentSinceState = nil
                     
+                    if !self.totalListEmails.isEmpty {
+                        let sortedListEmails = self.sortListEmails(currentListEmails: self.totalListEmails)
+                        self.totalListEmails = sortedListEmails
+                    }
+                    
                     onComplete(self.totalListEmails, self.listErrors)
                 }
             },
@@ -105,6 +114,11 @@ class JmapClient {
                 self.hasMoreChanges = false
                 self.currentSinceState = nil
                 
+                if !self.totalListEmails.isEmpty {
+                    let sortedListEmails = self.sortListEmails(currentListEmails: self.totalListEmails)
+                    self.totalListEmails = sortedListEmails
+                }
+                
                 onComplete(self.totalListEmails, self.listErrors)
             }
         )

ios/TwakeCore/Jmap/Model/Email/Email.swift

@@ -6,6 +6,7 @@ struct Email: Codable {
     let preview: String?
     let from: [EmailAddress]?
     let receivedAt: String?
+    let mailboxIds: [String: Bool]?
     
     func getSenderName() -> String? {
         if (from == nil || from?.isEmpty == true) {

ios/TwakeCore/Jmap/Utils/JmapConstants.swift

@@ -14,7 +14,8 @@ class JmapConstants {
         "subject",
         "preview",
         "from",
-        "receivedAt"
+        "receivedAt",
+        "mailboxIds"
     ]
     
     static let EMAIL_ID = "email_id"

ios/TwakeMailNSE/Model/KeychainSharingSession.swift

@@ -11,6 +11,7 @@ struct KeychainSharingSession: Codable {
     let basicAuth: String?
     let tokenEndpoint: String?
     let oidcScopes: [String]?
+    let mailboxIdsBlockNotification: [String]?
 }
 
 extension KeychainSharingSession {
@@ -25,7 +26,8 @@ extension KeychainSharingSession {
             tokenOIDC: self.tokenOIDC,
             basicAuth: self.basicAuth,
             tokenEndpoint: self.tokenEndpoint,
-            oidcScopes: self.oidcScopes
+            oidcScopes: self.oidcScopes,
+            mailboxIdsBlockNotification: self.mailboxIdsBlockNotification
         )
     }
 
@@ -45,7 +47,8 @@ extension KeychainSharingSession {
             ),
             basicAuth: self.basicAuth,
             tokenEndpoint: self.tokenEndpoint,
-            oidcScopes: self.oidcScopes
+            oidcScopes: self.oidcScopes,
+            mailboxIdsBlockNotification: self.mailboxIdsBlockNotification
         )
     }
     

ios/TwakeMailNSE/NotificationService.swift

@@ -85,31 +85,15 @@ class NotificationService: UNNotificationServiceExtension {
                                 newEmailDeliveryState: newEmailDeliveryState
                             )
 
-                            if (emails.count > 1) {
+                            let mailboxIdsBlockNotification = keychainSharingSession.mailboxIdsBlockNotification ?? []
-                                for email in emails {
+
-                                    if (email.id == emails.last?.id) {
+                            if (mailboxIdsBlockNotification.isEmpty) {
-                                        self.showModifiedNotification(title: email.getSenderName(),
+                                return self.showListNotification(emails: emails)
-                                                                      subtitle: email.subject,
-                                                                      body: email.preview,
-                                                                      badgeCount: emails.count,
-                                                                      userInfo: [JmapConstants.EMAIL_ID : email.id])
-                                        return self.notify()
-                                    } else {
-                                        self.showNewNotification(title: email.getSenderName(),
-                                                                 subtitle: email.subject,
-                                                                 body: email.preview,
-                                                                 badgeCount: emails.count,
-                                                                 notificationId: email.id,
-                                                                 userInfo: [JmapConstants.EMAIL_ID : email.id])
-                                    }
-                                }
                             } else {
-                                self.showModifiedNotification(title: emails.first!.getSenderName(),
+                                let emailFiltered = self.filterEmailsToPushNotification(
-                                                              subtitle: emails.first!.subject,
+                                    emails: emails,
-                                                              body: emails.first!.preview,
+                                    mailboxIdsBlockNotification: mailboxIdsBlockNotification)
-                                                              badgeCount: 1,
+                                return self.showListNotification(emails: emailFiltered)
-                                                              userInfo: [JmapConstants.EMAIL_ID : emails.first!.id])
-                                return self.notify()
                             }
                         }
                     } catch {
@@ -122,6 +106,38 @@ class NotificationService: UNNotificationServiceExtension {
         }
     }
     
+    private func filterEmailsToPushNotification(emails: [Email], mailboxIdsBlockNotification: [String]) -> [Email] {
+        return emails.filter { email in
+            guard let mailboxIds = email.mailboxIds else { return true }
+            for id in mailboxIds.keys {
+                if mailboxIdsBlockNotification.contains(id) {
+                    return false
+                }
+            }
+            return true
+        }
+    }
+    
+    private func showListNotification(emails: [Email]) {
+        for email in emails {
+            if (email.id == emails.last?.id) {
+                self.showModifiedNotification(title: email.getSenderName(),
+                                              subtitle: email.subject,
+                                              body: email.preview,
+                                              badgeCount: emails.count,
+                                              userInfo: [JmapConstants.EMAIL_ID : email.id])
+                return self.notify()
+            } else {
+                self.showNewNotification(title: email.getSenderName(),
+                                         subtitle: email.subject,
+                                         body: email.preview,
+                                         badgeCount: emails.count,
+                                         notificationId: email.id,
+                                         userInfo: [JmapConstants.EMAIL_ID : email.id])
+            }
+        }
+    }
+    
     private func showDefaultNotification(message: String) {
         self.modifiedContent?.title = InfoPlistReader(bundle: .app).bundleDisplayName
         self.modifiedContent?.body = message

lib/features/base/reloadable/reloadable_controller.dart

@@ -34,13 +34,17 @@ abstract class ReloadableController extends BaseController {
   void handleFailureViewState(Failure failure) {
     if (failure is GetCredentialFailure ||
         failure is GetStoredTokenOidcFailure ||
-        failure is GetAuthenticatedAccountFailure ||
+        failure is GetAuthenticatedAccountFailure) {
-        failure is UpdateAccountCacheFailure) {
       logError('$runtimeType::handleFailureViewState():Failure = $failure');
       goToLogin();
     } else if (failure is GetSessionFailure) {
       logError('$runtimeType::handleFailureViewState():Failure = $failure');
       _handleGetSessionFailure(failure.exception);
+    }  else if (failure is UpdateAccountCacheFailure) {
+      logError('$runtimeType::handleFailureViewState():Failure = $failure');
+      _handleUpdateAccountCacheCompleted(
+        session: failure.session,
+        apiUrl: failure.apiUrl);
     } else {
       super.handleFailureViewState(failure);
     }
@@ -50,25 +54,20 @@ abstract class ReloadableController extends BaseController {
   void handleSuccessViewState(Success success) {
     if (success is GetCredentialViewState) {
       log('$runtimeType::handleSuccessViewState:Success = ${success.runtimeType}');
-      _setDataToInterceptors(
+      _handleGetCredentialSuccess(success);
-        baseUrl: success.baseUrl.origin,
-        userName: success.userName,
-        password: success.password);
-      getSessionAction();
     } else if (success is GetStoredTokenOidcSuccess) {
       log('$runtimeType::handleSuccessViewState:Success = ${success.runtimeType}');
-      _setDataToInterceptors(
+      _handleGetStoredTokenOidcSuccess(success);
-        baseUrl: success.baseUrl.toString(),
-        tokenOIDC: success.tokenOidc,
-        oidcConfiguration: success.oidcConfiguration);
-      getSessionAction();
     } else if (success is GetSessionSuccess) {
       log('$runtimeType::handleSuccessViewState:Success = ${success.runtimeType}');
-      updateAccountCache(success.session);
+      updateAccountCache(
+        session: success.session,
+        baseUrl: dynamicUrlInterceptors.baseUrl);
     } else if (success is UpdateAccountCacheSuccess) {
       log('$runtimeType::handleSuccessViewState:Success = ${success.runtimeType}');
-      dynamicUrlInterceptors.changeBaseUrl(success.apiUrl);
+      _handleUpdateAccountCacheCompleted(
-      handleReloaded(success.session);
+        session: success.session,
+        apiUrl: success.apiUrl);
     } else {
       super.handleSuccessViewState(success);
     }
@@ -85,6 +84,27 @@ abstract class ReloadableController extends BaseController {
     consumeState(_getAuthenticatedAccountInteractor.execute());
   }
 
+  void _handleGetCredentialSuccess(GetCredentialViewState success) {
+    _setDataToInterceptors(
+      baseUrl: success.baseUrl.origin,
+      userName: success.userName,
+      password: success.password);
+    getSessionAction();
+  }
+
+  void _handleGetStoredTokenOidcSuccess(GetStoredTokenOidcSuccess success) {
+    _setDataToInterceptors(
+      baseUrl: success.baseUrl.toString(),
+      tokenOIDC: success.tokenOidc,
+      oidcConfiguration: success.oidcConfiguration);
+    getSessionAction();
+  }
+
+  void _handleUpdateAccountCacheCompleted({required Session session, String? apiUrl}) {
+    dynamicUrlInterceptors.changeBaseUrl(apiUrl);
+    handleReloaded(session);
+  }
+
   void _setDataToInterceptors({
     required String baseUrl,
     UserName? userName,
@@ -131,7 +151,13 @@ abstract class ReloadableController extends BaseController {
     }
   }
 
-  void updateAccountCache(Session session) {
+  void updateAccountCache({
-    consumeState(_updateAccountCacheInteractor.execute(session));
+    required Session session,
+    String? baseUrl
+  }) {
+    consumeState(_updateAccountCacheInteractor.execute(
+      session: session,
+      baseUrl: baseUrl
+    ));
   }
 }

lib/features/login/data/network/interceptors/authorization_interceptors.dart

@@ -48,11 +48,11 @@ class AuthorizationInterceptors extends QueuedInterceptorsWrapper {
     _token = newToken;
     _configOIDC = newConfig;
     _authenticationType = AuthenticationType.oidc;
-    log('AuthorizationInterceptors::setTokenAndAuthorityOidc: TokenId = ${newToken?.tokenIdHash}');
+    log('AuthorizationInterceptors::setTokenAndAuthorityOidc: INITIAL_TOKEN = ${newToken?.token} | EXPIRED_TIME = ${newToken?.expiredTime}');
   }
 
   void _updateNewToken(TokenOIDC newToken) {
-    log('AuthorizationInterceptors::_updateNewToken: TokenId = ${newToken.tokenIdHash}');
+    log('AuthorizationInterceptors::_updateNewToken: NEW_TOKEN = ${newToken.token} | EXPIRED_TIME = ${newToken.expiredTime}');
     _token = newToken;
   }
 

lib/features/login/domain/state/update_authentication_account_state.dart

@@ -17,6 +17,15 @@ class UpdateAccountCacheSuccess extends UIState {
 }
 
 class UpdateAccountCacheFailure extends FeatureFailure {
+  final Session session;
+  final String apiUrl;
 
-  UpdateAccountCacheFailure(dynamic exception) : super(exception: exception);
+  UpdateAccountCacheFailure({
+    required this.session,
+    required this.apiUrl,
+    dynamic exception,
+  }) : super(exception: exception);
+
+  @override
+  List<Object?> get props => [session, apiUrl, ...super.props];
 }

lib/features/login/domain/usecases/update_account_cache_interactor.dart

@@ -1,39 +1,26 @@
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
+import 'package:core/utils/app_logger.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:model/account/authentication_type.dart';
-import 'package:model/account/personal_account.dart';
 import 'package:model/extensions/personal_account_extension.dart';
 import 'package:model/extensions/session_extension.dart';
 import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
-import 'package:tmail_ui_user/features/login/domain/repository/credential_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/state/update_authentication_account_state.dart';
 
 class UpdateAccountCacheInteractor {
   final AccountRepository _accountRepository;
-  final CredentialRepository _credentialRepository;
 
-  UpdateAccountCacheInteractor(
+  UpdateAccountCacheInteractor(this._accountRepository);
-    this._accountRepository,
-    this._credentialRepository);
 
-  Stream<Either<Failure, Success>> execute(Session session) async* {
+  Stream<Either<Failure, Success>> execute({required Session session, String? baseUrl}) async* {
+    final apiUrl = _getQualifiedApiUrl(session: session, baseUrl: baseUrl);
+    log('UpdateAccountCacheInteractor::execute: ApiUrl = $apiUrl');
     try{
       yield Right(UpdatingAccountCache());
 
-      final futureValue = await Future.wait([
+      final currentAccount = await _accountRepository.getCurrentAccount();
-        _credentialRepository.getBaseUrl(),
-        _accountRepository.getCurrentAccount(),
-      ], eagerError: true);
-
-      final baseUrl = futureValue[0] as Uri;
-      final currentAccount = futureValue[1] as PersonalAccount;
-      final apiUrl = session.getQualifiedApiUrl(
-        baseUrl: currentAccount.authenticationType == AuthenticationType.basic
-          ? baseUrl.origin
-          : baseUrl.toString());
 
       await _accountRepository.setCurrentAccount(
         currentAccount.fromAccount(
@@ -46,7 +33,20 @@ class UpdateAccountCacheInteractor {
         session: session,
         apiUrl: apiUrl));
     } catch(e) {
-      yield Left(UpdateAccountCacheFailure(e));
+      yield Left(UpdateAccountCacheFailure(
+        session: session,
+        apiUrl: apiUrl,
+        exception: e
+      ));
+    }
+  }
+
+  String _getQualifiedApiUrl({required Session session, String? baseUrl}) {
+    try {
+      return session.getQualifiedApiUrl(baseUrl: baseUrl);
+    } catch (e) {
+      logError('UpdateAccountCacheInteractor::_getQualifiedApiUrl:Exception = $e');
+      return '';
     }
   }
 }

lib/features/mailbox/presentation/mailbox_controller.dart

@@ -84,6 +84,7 @@ import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 import 'package:tmail_ui_user/main/routes/navigation_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 import 'package:tmail_ui_user/main/routes/route_utils.dart';
+import 'package:tmail_ui_user/main/utils/ios_sharing_manager.dart';
 
 class MailboxController extends BaseMailboxController with MailboxActionHandlerMixin {
 
@@ -97,6 +98,8 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
   final SubscribeMultipleMailboxInteractor _subscribeMultipleMailboxInteractor;
   final CreateDefaultMailboxInteractor _createDefaultMailboxInteractor;
 
+  IOSSharingManager? _iosSharingManager;
+
   final currentSelectMode = SelectMode.INACTIVE.obs;
   final _activeScrollTop = RxBool(false);
   final _activeScrollBottom = RxBool(true);
@@ -206,6 +209,9 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
         _handleCreateDefaultFolderIfMissing(mailboxDashBoardController.mapDefaultMailboxIdByRole);
         _handleDataFromNavigationRouter();
         mailboxDashBoardController.getSpamReportBanner();
+        if (PlatformInfo.isIOS) {
+          _updateMailboxIdsBlockNotificationToKeychain(success.mailboxList);
+        }
       } else if (success is RefreshChangesAllMailboxSuccess) {
         _selectSelectedMailboxDefault();
         mailboxDashBoardController.refreshSpamReportBanner();
@@ -1115,7 +1121,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
       curve: Curves.fastOutSlowIn);
   }
 
-  void _handleGetAllMailboxSuccess(GetAllMailboxSuccess success) async {
+  Future<void> _handleGetAllMailboxSuccess(GetAllMailboxSuccess success) async {
     currentMailboxState = success.currentMailboxState;
     log('MailboxController::_handleGetAllMailboxSuccess:currentMailboxState: $currentMailboxState');
     final listMailboxDisplayed = success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes;
@@ -1127,6 +1133,28 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
     _setOutboxMailbox();
   }
 
+  Future<void> _updateMailboxIdsBlockNotificationToKeychain(List<PresentationMailbox> mailboxes) async {
+    _iosSharingManager = getBinding<IOSSharingManager>();
+    final accountId = mailboxDashBoardController.accountId.value;
+    if (accountId == null || _iosSharingManager == null || mailboxes.isEmpty) {
+      logError('MailboxController::_updateMailboxIdsBlockNotificationToKeychain: AccountId = $accountId | IosSharingManager = $_iosSharingManager | Mailboxes = ${mailboxes.length}');
+      return;
+    }
+
+    if (await _iosSharingManager!.isExistMailboxIdsBlockNotificationInKeyChain(accountId)) {
+      return;
+    }
+
+    final mailboxIdsBlockNotification = mailboxes
+      .where((presentationMailbox) => presentationMailbox.pushNotificationDeactivated && presentationMailbox.mailboxId != null)
+      .map((presentationMailbox) => presentationMailbox.mailboxId!)
+      .toList();
+    log('MailboxController::_updateMailboxIdsBlockNotificationToKeychain:MailboxIdsBlockNotification = $mailboxIdsBlockNotification');
+    _iosSharingManager!.updateMailboxIdsBlockNotificationInKeyChain(
+      accountId: accountId,
+      mailboxIds: mailboxIdsBlockNotification);
+  }
+
   void _handleRefreshChangesAllMailboxSuccess(RefreshChangesAllMailboxSuccess success) async {
     currentMailboxState = success.currentMailboxState;
     log('MailboxController::_handleRefreshChangesAllMailboxSuccess:currentMailboxState: $currentMailboxState');

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -517,8 +517,6 @@ class MailboxDashBoardController extends ReloadableController {
 
   void _handleSessionFromArguments(Session session) {
     log('MailboxDashBoardController::_handleSession:');
-    updateAccountCache(session);
-
     _setUpComponentsFromSession(session);
 
     if (PlatformInfo.isWeb) {

lib/features/push_notification/data/extensions/keychain_sharing_session_extension.dart

@@ -1,20 +1,22 @@
 
+import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:tmail_ui_user/features/push_notification/data/keychain/keychain_sharing_session.dart';
 
 extension KeychainSharingSessionExtension on KeychainSharingSession {
 
-  KeychainSharingSession updating({String? emailState}) {
+  KeychainSharingSession updating({String? emailState, List<MailboxId>? mailboxIdsBlockNotification}) {
     return KeychainSharingSession(
       accountId: accountId,
       userName: userName,
       authenticationType: authenticationType,
       apiUrl: apiUrl,
-      emailState: emailState ?? emailState,
+      emailState: emailState ?? this.emailState,
       emailDeliveryState: emailDeliveryState,
       tokenOIDC: tokenOIDC,
       basicAuth: basicAuth,
       tokenEndpoint: tokenEndpoint,
       oidcScopes: oidcScopes,
+      mailboxIdsBlockNotification: mailboxIdsBlockNotification ?? this.mailboxIdsBlockNotification,
     );
   }
 }

lib/features/push_notification/data/keychain/keychain_sharing_session.dart

@@ -1,14 +1,17 @@
 import 'package:equatable/equatable.dart';
 import 'package:jmap_dart_client/http/converter/account_id_converter.dart';
+import 'package:jmap_dart_client/http/converter/mailbox_id_converter.dart';
 import 'package:jmap_dart_client/http/converter/user_name_converter.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
+import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:model/account/authentication_type.dart';
 import 'package:model/oidc/token_oidc.dart';
 
 part 'keychain_sharing_session.g.dart';
 
+@MailboxIdConverter()
 @UserNameConverter()
 @AccountIdConverter()
 @JsonSerializable(includeIfNull: false, explicitToJson: true)
@@ -23,6 +26,7 @@ class KeychainSharingSession with EquatableMixin {
   String? basicAuth;
   String? tokenEndpoint;
   List<String>? oidcScopes;
+  List<MailboxId>? mailboxIdsBlockNotification;
 
   KeychainSharingSession({
     required this.accountId,
@@ -35,6 +39,7 @@ class KeychainSharingSession with EquatableMixin {
     this.basicAuth,
     this.tokenEndpoint,
     this.oidcScopes,
+    this.mailboxIdsBlockNotification,
   });
 
   factory KeychainSharingSession.fromJson(Map<String, dynamic> json) => _$KeychainSharingSessionFromJson(json);
@@ -53,5 +58,6 @@ class KeychainSharingSession with EquatableMixin {
     basicAuth,
     tokenEndpoint,
     oidcScopes,
+    mailboxIdsBlockNotification,
   ];
 }

lib/main/bindings/credential/credential_bindings.dart

@@ -61,9 +61,7 @@ class CredentialBindings extends InteractorsBindings {
       Get.find<CredentialRepository>(),
       Get.find<AccountRepository>()
     ));
-    Get.put(UpdateAccountCacheInteractor(
+    Get.put(UpdateAccountCacheInteractor(Get.find<AccountRepository>()));
-      Get.find<AccountRepository>(),
-      Get.find<CredentialRepository>()));
   }
 
   @override

lib/main/bindings/network/network_bindings.dart

@@ -23,6 +23,7 @@ import 'package:tmail_ui_user/features/login/data/network/dns_service.dart';
 import 'package:tmail_ui_user/features/login/data/network/interceptors/authorization_interceptors.dart';
 import 'package:tmail_ui_user/features/login/data/network/oidc_http_client.dart';
 import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart';
+import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/local/state_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_api.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/network/spam_report_api.dart';
@@ -80,6 +81,7 @@ class NetworkBindings extends Bindings {
       Get.find<AuthenticationInfoCacheManager>(),
       Get.find<OidcConfigurationCacheManager>(),
       Get.find<OIDCHttpClient>(),
+      Get.find<MailboxCacheManager>(),
     ));
   }
 

lib/main/utils/ios_sharing_manager.dart

@@ -4,13 +4,16 @@ import 'dart:convert';
 import 'package:core/utils/app_logger.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
+import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/account/authentication_type.dart';
 import 'package:model/account/personal_account.dart';
+import 'package:model/extensions/mailbox_extension.dart';
 import 'package:model/oidc/token_oidc.dart';
 import 'package:tmail_ui_user/features/login/data/local/authentication_info_cache_manager.dart';
 import 'package:tmail_ui_user/features/login/data/local/oidc_configuration_cache_manager.dart';
 import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager.dart';
 import 'package:tmail_ui_user/features/login/data/network/oidc_http_client.dart';
+import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/local/state_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/model/state_type.dart';
 import 'package:tmail_ui_user/features/push_notification/data/extensions/keychain_sharing_session_extension.dart';
@@ -24,6 +27,7 @@ class IOSSharingManager {
   final AuthenticationInfoCacheManager _authenticationInfoCacheManager;
   final OidcConfigurationCacheManager _oidcConfigurationCacheManager;
   final OIDCHttpClient _oidcHttpClient;
+  final MailboxCacheManager _mailboxCacheManager;
 
   IOSSharingManager(
     this._keychainSharingManager,
@@ -32,6 +36,7 @@ class IOSSharingManager {
     this._authenticationInfoCacheManager,
     this._oidcConfigurationCacheManager,
     this._oidcHttpClient,
+    this._mailboxCacheManager,
   );
 
   bool _validateToSaveKeychain(PersonalAccount personalAccount) {
@@ -79,6 +84,10 @@ class IOSSharingManager {
 
       final tokenRecords = await _getTokenEndpointAndScopes();
 
+      final mailboxIdsBlockNotification = await _getMailboxIdsBlockNotification(
+        accountId: personalAccount.accountId!,
+        userName: personalAccount.userName!);
+
       final keychainSharingSession = KeychainSharingSession(
         accountId: personalAccount.accountId!,
         userName: personalAccount.userName!,
@@ -90,7 +99,7 @@ class IOSSharingManager {
         basicAuth: credentialInfo,
         tokenEndpoint: tokenRecords?.tokenEndpoint,
         oidcScopes: tokenRecords?.scopes,
-      );
+        mailboxIdsBlockNotification: mailboxIdsBlockNotification);
 
       await _keychainSharingManager.save(keychainSharingSession);
 
@@ -184,4 +193,48 @@ class IOSSharingManager {
     final newKeychain = keychainSharingStored.updating(emailState: newEmailState);
     await _keychainSharingManager.save(newKeychain);
   }
+
+  Future<bool> isExistMailboxIdsBlockNotificationInKeyChain(AccountId accountId) async {
+    try {
+      final keychainSharingStored = await getKeychainSharingSession(accountId);
+      return keychainSharingStored?.mailboxIdsBlockNotification?.isNotEmpty == true;
+    } catch (e) {
+      logError('IOSSharingManager::getMailboxIdsBlockNotificationInKeyChain:Exception = $e');
+      return false;
+    }
+  }
+
+  Future<void> updateMailboxIdsBlockNotificationInKeyChain({
+    required AccountId accountId,
+    required List<MailboxId> mailboxIds
+  }) async {
+    try {
+      final keychainSharingStored = await getKeychainSharingSession(accountId);
+      if (keychainSharingStored == null) {
+        return;
+      }
+      final newKeychain = keychainSharingStored.updating(mailboxIdsBlockNotification: mailboxIds);
+      await _keychainSharingManager.save(newKeychain);
+    } catch (e) {
+      logError('IOSSharingManager::updateMailboxIdsBlockNotificationInKeyChain: Exception = $e');
+    }
+  }
+
+  Future<List<MailboxId>?> _getMailboxIdsBlockNotification({
+    required AccountId accountId,
+    required UserName userName,
+  }) async {
+    try {
+      final mailboxesCache = await _mailboxCacheManager.getAllMailbox(accountId, userName);
+      final listMailboxIdBlockNotification = mailboxesCache
+        .where((mailbox) => mailbox.pushNotificationDeactivated && mailbox.id != null)
+        .map((mailbox) => mailbox.id!)
+        .toList();
+      log('IOSSharingManager::_getMailboxIdsBlockNotification(): CACHE_MAILBOX_LIST = $listMailboxIdBlockNotification');
+      return listMailboxIdBlockNotification;
+    } catch (e) {
+      logError('IOSSharingManager::_getMailboxIdsBlockNotification:Exception: $e');
+      return null;
+    }
+  }
 }

model/lib/extensions/mailbox_extension.dart

@@ -6,6 +6,18 @@ extension MailboxExtension on Mailbox {
 
   bool hasRole() => role != null && role!.value.isNotEmpty;
 
+  bool get isSpam => role == PresentationMailbox.roleSpam;
+
+  bool get isTrash => role == PresentationMailbox.roleTrash;
+
+  bool get isDrafts => role == PresentationMailbox.roleDrafts;
+
+  bool get isSent => role == PresentationMailbox.roleSent;
+
+  bool get isOutbox => name?.name == PresentationMailbox.outboxRole || role == PresentationMailbox.roleOutbox;
+
+  bool get pushNotificationDeactivated => isOutbox || isSent || isDrafts || isTrash || isSpam;
+
   PresentationMailbox toPresentationMailbox() {
     return PresentationMailbox(
       id!,

model/lib/mailbox/presentation_mailbox.dart

@@ -14,7 +14,7 @@ class PresentationMailbox with EquatableMixin {
   static const String templatesRole= 'templates';
   static const String outboxRole = 'outbox';
   static const String draftsRole = 'drafts';
-  static const String spamRole = 'spam';
+  static const String spamRole = 'junk';
   static const String archiveRole = 'archive';
   static const String recoveredRole = 'restored messages';
 

model/lib/oidc/token_oidc.dart

@@ -1,4 +1,5 @@
 
+import 'package:core/utils/app_logger.dart';
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:model/oidc/converter/token_id_converter.dart';
@@ -39,6 +40,8 @@ extension TokenOIDCExtension on TokenOIDC {
   bool get isExpired {
     if (expiredTime != null) {
       final now = DateTime.now();
+      log('TokenOIDC::isExpired(): TIME_NOW: $now');
+      log('TokenOIDC::isExpired(): EXPIRED_DATE: $expiredTime');
       return expiredTime!.isBefore(now);
     }
     return false;