TF-2464 Save both EmailDelivery and EmailState in the keychain

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit a37fe7ea8bcc38eb96df39f46128c9e1f7af046e)

lib/features/mailbox/data/datasource_impl/state_datasource_impl.dart

@@ -36,7 +36,7 @@ class StateDataSourceImpl extends StateDataSource {
       if (PlatformInfo.isIOS && stateCache.type == StateType.email) {
         final emailDeliveryStateKeychain = await _iosSharingManager.getEmailDeliveryStateFromKeychain(accountId);
         if (emailDeliveryStateKeychain == null || emailDeliveryStateKeychain.isEmpty) {
-          await _iosSharingManager.updateEmailDeliveryStateInKeyChain(accountId, stateCache.state);
+          await _iosSharingManager.updateEmailStateInKeyChain(accountId, stateCache.state);
         }
       }
       return Future.value(null);

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

@@ -3,13 +3,14 @@ import 'package:tmail_ui_user/features/push_notification/data/keychain/keychain_
 
 extension KeychainSharingSessionExtension on KeychainSharingSession {
 
-  KeychainSharingSession updating({String? emailDeliveryState}) {
+  KeychainSharingSession updating({String? emailState, String? emailDeliveryState}) {
     return KeychainSharingSession(
       accountId: accountId,
       userName: userName,
       authenticationType: authenticationType,
       apiUrl: apiUrl,
-      emailState: emailDeliveryState ?? emailDeliveryState,
+      emailState: emailState ?? emailState,
+      emailDeliveryState: emailDeliveryState ?? emailDeliveryState,
       tokenOIDC: tokenOIDC,
       basicAuth: basicAuth,
       tokenEndpoint: tokenEndpoint,

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

@@ -18,6 +18,7 @@ class KeychainSharingSession with EquatableMixin {
   AuthenticationType authenticationType;
   String apiUrl;
   String? emailState;
+  String? emailDeliveryState;
   TokenOIDC? tokenOIDC;
   String? basicAuth;
   String? tokenEndpoint;
@@ -29,6 +30,7 @@ class KeychainSharingSession with EquatableMixin {
     required this.authenticationType,
     required this.apiUrl,
     this.emailState,
+    this.emailDeliveryState,
     this.tokenOIDC,
     this.basicAuth,
     this.tokenEndpoint,
@@ -46,6 +48,7 @@ class KeychainSharingSession with EquatableMixin {
     authenticationType,
     apiUrl,
     emailState,
+    emailDeliveryState,
     tokenOIDC,
     basicAuth,
     tokenEndpoint,

lib/features/push_notification/presentation/listener/email_change_listener.dart

@@ -333,10 +333,6 @@ class EmailChangeListener extends ChangeListener {
     if (_iosSharingManager == null) {
       return;
     }
-
-    final emailDeliveryStateKeychain = await _iosSharingManager!.getEmailDeliveryStateFromKeychain(accountId);
-    if (emailDeliveryStateKeychain == null || emailDeliveryStateKeychain.isEmpty) {
-      await _iosSharingManager!.updateEmailDeliveryStateInKeyChain(accountId, emailDeliveryState);
-    }
+    await _iosSharingManager!.updateEmailDeliveryStateInKeyChain(accountId, emailDeliveryState);
   }
 }

lib/main/utils/ios_sharing_manager.dart

@@ -36,11 +36,8 @@ class IOSSharingManager {
 
   Future<String?> getEmailDeliveryStateFromKeychain(AccountId accountId) async {
     try {
-      if (await _keychainSharingManager.isSessionExist(accountId)) {
-        final keychainSharingStored = await _keychainSharingManager.getSharingSession(accountId);
-        return keychainSharingStored?.emailState;
-      }
-      return null;
+      final keychainSharingStored = await getKeychainSharingSession(accountId);
+      return keychainSharingStored?.emailDeliveryState;
     } catch (e) {
       logError('IOSSharingManager::_getEmailDeliveryStateFromKeychain: Exception: $e');
       return null;
@@ -67,12 +64,18 @@ class IOSSharingManager {
         userName: personalAccount.userName!
       );
 
+      final emailState = await _getEmailState(
+        accountId: personalAccount.accountId!,
+        userName: personalAccount.userName!
+      );
+
       final keychainSharingSession = KeychainSharingSession(
         accountId: personalAccount.accountId!,
         userName: personalAccount.userName!,
         authenticationType: personalAccount.authenticationType,
         apiUrl: personalAccount.apiUrl!,
-        emailState: emailDeliveryState,
+        emailState: emailState,
+        emailDeliveryState: emailDeliveryState,
         tokenOIDC: authenticationInfo.value1,
         basicAuth: authenticationInfo.value2
       );
@@ -123,15 +126,8 @@ class IOSSharingManager {
     required UserName userName
   }) async {
     try {
-      String? emailDeliveryState = await getEmailDeliveryStateFromKeychain(accountId);
-      if (emailDeliveryState == null || emailDeliveryState.isEmpty) {
-        final emailState = await _stateCacheManager.getState(
-          accountId,
-          userName,
-          StateType.email
-        );
-        emailDeliveryState = emailState?.value;
-      }
+      final emailDeliveryState = await getEmailDeliveryStateFromKeychain(accountId);
+      log('IOSSharingManager::_getEmailState:emailDeliveryState: $emailDeliveryState');
       return emailDeliveryState;
     } catch (e) {
       logError('IOSSharingManager::_getEmailDeliveryState:Exception: $e');
@@ -139,13 +135,41 @@ class IOSSharingManager {
     }
   }
 
+  Future<String?> _getEmailState({
+    required AccountId accountId,
+    required UserName userName
+  }) async {
+    try {
+      final emailState = await _stateCacheManager.getState(
+        accountId,
+        userName,
+        StateType.email
+      );
+      log('IOSSharingManager::_getEmailState:emailState: $emailState');
+      return emailState?.value;
+    } catch (e) {
+      logError('IOSSharingManager::_getEmailState:Exception: $e');
+      return null;
+    }
+  }
+
   Future updateEmailDeliveryStateInKeyChain(AccountId accountId, String newEmailDeliveryState) async {
-    final keychainSharingSession = await getKeychainSharingSession(accountId);
-    log('IOSSharingManager::updateEmailDeliveryStateInKeyChain:keychainSharingSession: $keychainSharingSession');
-    if (keychainSharingSession == null) {
+    final keychainSharingStored = await getKeychainSharingSession(accountId);
+    log('IOSSharingManager::updateEmailDeliveryStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailDeliveryState: $newEmailDeliveryState');
+    if (keychainSharingStored == null) {
       return;
     }
-    final newKeychain = keychainSharingSession.updating(emailDeliveryState: newEmailDeliveryState);
+    final newKeychain = keychainSharingStored.updating(emailDeliveryState: newEmailDeliveryState);
+    await _keychainSharingManager.save(newKeychain);
+  }
+
+  Future updateEmailStateInKeyChain(AccountId accountId, String newEmailState) async {
+    final keychainSharingStored = await getKeychainSharingSession(accountId);
+    log('IOSSharingManager::updateEmailStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailState: $newEmailState');
+    if (keychainSharingStored == null) {
+      return;
+    }
+    final newKeychain = keychainSharingStored.updating(emailState: newEmailState);
     await _keychainSharingManager.save(newKeychain);
   }
 }