TF-1360 Fix can not load new email until reload mail list

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

@@ -165,6 +165,9 @@ class MailboxDashBoardController extends ReloadableController {
   final StreamController<RefreshActionViewEvent> _refreshActionEventController =
     StreamController<RefreshActionViewEvent>.broadcast();
 
+  final _notificationManager = LocalNotificationManager.instance;
+  final _fcmController = FcmController.instance;
+
   MailboxDashBoardController(
     LogoutOidcInteractor logoutOidcInteractor,
     DeleteAuthorityOidcInteractor deleteAuthorityOidcInteractor,
@@ -197,11 +200,6 @@ class MailboxDashBoardController extends ReloadableController {
     _registerPendingFileInfo();
     _getSessionCurrent();
     _getAppVersion();
-    if (!BuildUtils.isWeb) {
-      _handleOpenAppByNotification();
-    } else {
-      dispatchRoute(DashboardRoutes.thread);
-    }
     super.onReady();
   }
 
@@ -272,12 +270,13 @@ class MailboxDashBoardController extends ReloadableController {
           clearState();
         } else if (failure is SaveEmailAsDraftsFailure
             || failure is RemoveEmailDraftsFailure
-            || failure is UpdateEmailDraftsFailure
+            || failure is UpdateEmailDraftsFailure) {
-            || failure is GetEmailByIdFailure) {
           clearState();
         } else if (failure is MarkAsMailboxReadAllFailure ||
             failure is MarkAsMailboxReadFailure) {
           _markAsReadMailboxFailure(failure);
+        } else if (failure is GetEmailByIdFailure) {
+          _handleGetEmailDetailedFailed(failure);
         }
       },
       (success) {
@@ -368,15 +367,20 @@ class MailboxDashBoardController extends ReloadableController {
       .debounceTime(const Duration(milliseconds: FcmService.durationMessageComing))
       .listen(_handleRefreshActionWhenBackToApp);
 
-    LocalNotificationManager.instance.localNotificationStream.listen(_handleLocalNotificationResponse);
+    _notificationManager.localNotificationStream.listen(_handleClickLocalNotificationOnForeground);
   }
 
-  void _handleOpenAppByNotification() async {
+  void _handleClickLocalNotificationOnTerminated() async {
-    log("_handleOpenAppByNotification(): isOpenAppByNotification: ${LocalNotificationManager.instance.isOpenAppByNotification}");
+    await _notificationManager.getNotificationDetails();
-    await LocalNotificationManager.instance.setUp();
+    final notificationResponse = _notificationManager.currentNotificationResponse;
-    if (LocalNotificationManager.instance.isOpenAppByNotification) {
+    log('MailboxDashBoardController::_handleClickLocalNotificationOnTerminated():payload: ${notificationResponse?.payload}');
-      final emailId = EmailId(Id(LocalNotificationManager.instance.getEmailIdFromNotification()!));
+    final emailIdFromPayload = notificationResponse?.payload;
-      _getPresentationEmailFromEmailId(emailId);
+    final currentAccountId = accountId.value;
+    if (emailIdFromPayload?.isNotEmpty == true && currentAccountId != null) {
+      _getPresentationEmailFromEmailIdAction(
+        EmailId(Id(emailIdFromPayload!)),
+        currentAccountId
+      );
     } else {
       dispatchRoute(DashboardRoutes.thread);
     }
@@ -387,6 +391,9 @@ class MailboxDashBoardController extends ReloadableController {
   }
 
   void _getSessionCurrent() {
+    if (BuildUtils.isWeb) {
+      dispatchRoute(DashboardRoutes.thread);
+    }
     final arguments = Get.arguments;
     log('MailboxDashBoardController::_getSessionCurrent(): arguments = $arguments');
     if (arguments is Session) {
@@ -398,6 +405,10 @@ class MailboxDashBoardController extends ReloadableController {
       injectVacationBindings(sessionCurrent, accountId.value);
       injectFCMBindings(sessionCurrent, accountId.value);
       _getVacationResponse();
+
+      if (!BuildUtils.isWeb) {
+        _handleClickLocalNotificationOnTerminated();
+      }
     } else {
       reload();
     }
@@ -1371,36 +1382,62 @@ class MailboxDashBoardController extends ReloadableController {
     }
   }
 
-  Future<bool> haveLocalNotificationPress() async {
+  void _handleClickLocalNotificationOnForeground(NotificationResponse? response) {
-    return !(await LocalNotificationManager.instance.localNotificationStream.isEmpty);
+    log('MailboxDashBoardController::_handleClickLocalNotificationOnForeground():payload: ${response?.payload}');
-  }
+    final emailIdFromPayload = response?.payload;
+    final currentAccountId = accountId.value;
+    if (emailIdFromPayload?.isNotEmpty == true && currentAccountId != null) {
+      popAllRouteIfHave();
+      dispatchRoute(DashboardRoutes.waiting);
 
-  void _handleLocalNotificationResponse(NotificationResponse response) {
+      _getPresentationEmailFromEmailIdAction(
-    if(response.payload != null) {
+        EmailId(Id(emailIdFromPayload!)),
-      final emailId = EmailId(Id(response.payload!));
+        currentAccountId
-      _getPresentationEmailFromEmailId(emailId);
+      );
+    } else {
+      dispatchRoute(DashboardRoutes.thread);
     }
   }
 
-  void _getPresentationEmailFromEmailId(EmailId emailId) {
+  void _getPresentationEmailFromEmailIdAction(EmailId emailId, AccountId accountId) {
-    if(accountId.value != null) {
+    log('MailboxDashBoardController:_getPresentationEmailFromEmailIdAction:emailId: $emailId');
-      log('MailboxDashBoardController: _getPresentationEmailFromEmailId: $emailId');
+    consumeState(_getEmailByIdInteractor.execute(
-      consumeState(_getEmailByIdInteractor.execute(accountId.value!, emailId, properties: ThreadConstants.propertiesDefault));
+      accountId,
-    }
+      emailId,
+      properties: ThreadConstants.propertiesDefault
+    ));
   }
 
   void _moveToEmailDetailedView(GetEmailByIdSuccess success) {
     log('MailboxDashBoardController::_moveToEmailDetailedView(): ${success.email}');
     setSelectedEmail(success.email);
     dispatchRoute(DashboardRoutes.emailDetailed);
-    // move to inbox so that user can back to inbox view
+  }
-    dispatchAction(ClearSearchEmailAction());
+
+  void _handleGetEmailDetailedFailed(GetEmailByIdFailure failure) {
+    logError('MailboxDashBoardController::_handleGetEmailDetailedFailed(): $failure');
+    dispatchRoute(DashboardRoutes.thread);
   }
 
   void popAllRouteIfHave() {
     Get.until((route) => Get.currentRoute == AppRoutes.dashboard);
   }
 
+  void handleOnFocusGained() {
+    log('MailboxDashBoardController::handleOnFocusGained():');
+    if (!BuildUtils.isWeb) {
+      _updateTheme();
+    }
+    refreshActionWhenBackToApp();
+  }
+
+  void _updateTheme() {
+    ThemeUtils.setSystemDarkUIStyle();
+    if (isDrawerOpen) {
+      ThemeUtils.setStatusBarTransparentColor();
+    }
+  }
+
   @override
   void onClose() {
     _emailReceiveManager.closeEmailReceiveManagerStream();
@@ -1409,8 +1446,8 @@ class MailboxDashBoardController extends ReloadableController {
     _progressStateController.close();
     _refreshActionEventController.close();
     Get.delete<DownloadController>();
-    FcmController.instance.dispose();
+    _notificationManager.dispose();
-    LocalNotificationManager.instance.dispose();
+    _fcmController.dispose();
     super.onClose();
   }
 }

lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart

@@ -1,6 +1,5 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
-import 'package:core/presentation/utils/theme_utils.dart';
 import 'package:core/presentation/views/responsive/responsive_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -30,17 +29,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
     );
 
     return FocusDetector(
-      onFocusGained: () async {
+      onFocusGained: controller.handleOnFocusGained,
-        ThemeUtils.setSystemDarkUIStyle();
-        if (controller.isDrawerOpen) {
-          ThemeUtils.setStatusBarTransparentColor();
-        }
-        if(await controller.haveLocalNotificationPress()) {
-          controller.popAllRouteIfHave();
-          controller.dispatchRoute(DashboardRoutes.waiting);
-        }
-        controller.refreshActionWhenBackToApp();
-      },
       child: Scaffold(
         drawerEnableOpenDragGesture: responsiveUtils.hasLeftMenuDrawerActive(context),
         body: Obx(() {

lib/features/push_notification/presentation/notification/local_notification_manager.dart

@@ -6,7 +6,7 @@ import 'package:core/presentation/extensions/html_extension.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
-import 'package:model/model.dart';
+import 'package:model/extensions/email_address_extension.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_config.dart';
 
 class LocalNotificationManager {
@@ -28,7 +28,6 @@ class LocalNotificationManager {
 
   Future<void> setUp() async {
     try {
-      _notificationAppLaunchDetails = await _localNotificationsPlugin.getNotificationAppLaunchDetails();
       await _initLocalNotification();
       _checkLocalNotificationPermission();
       if (Platform.isAndroid) {
@@ -41,19 +40,17 @@ class LocalNotificationManager {
     return Future.value();
   }
 
-  bool get isOpenAppByNotification => _notificationAppLaunchDetails?.didNotificationLaunchApp ?? false;
+  Future<void> getNotificationDetails() async {
-
+    try {
-  bool get isLocalNotificationStreamClosed => localNotificationsController.isClosed;
+      _notificationAppLaunchDetails = await _localNotificationsPlugin.getNotificationAppLaunchDetails();
-
+    } catch (e) {
-  String? getEmailIdFromNotification() {
+      logError('LocalNotificationManager::getNotificationDetails(): ERROR: ${e.toString()}');
-    if(_notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
-      log('LocalNotificationManager::handleNotificationAppLaunch(): ${_notificationAppLaunchDetails!.notificationResponse}');
-      final selectedNotificationPayload = _notificationAppLaunchDetails!.notificationResponse?.payload;
-      return selectedNotificationPayload;
     }
-    return null;
+    return Future.value();
   }
 
+  NotificationResponse? get currentNotificationResponse => _notificationAppLaunchDetails?.notificationResponse;
+
   Future<bool?> _initLocalNotification() async {
     return await _localNotificationsPlugin.initialize(
       const InitializationSettings(
@@ -65,8 +62,8 @@ class LocalNotificationManager {
   }
 
   void _handleReceiveNotificationResponse(NotificationResponse response) {
-    log('LocalNotificationManager::handleReceiveNotificationResponse(): ${response.payload}');
+    log('LocalNotificationManager::handleReceiveNotificationResponse():payload: ${response.payload}');
-    if(response.notificationResponseType == NotificationResponseType.selectedNotification) {
+    if (response.notificationResponseType == NotificationResponseType.selectedNotification) {
       localNotificationsController.add(response);
     }
   }