TF-3480 Fix conflict when rebase master

Signed-off-by: dab246 <tdvu@linagora.com>

lib/features/composer/domain/usecases/save_composer_cache_on_web_interactor.dart

@@ -36,7 +36,7 @@ class SaveComposerCacheOnWebInteractor {
           email: emailCreated,
           hasRequestReadReceipt: createEmailRequest.hasRequestReadReceipt,
           isMarkAsImportant: createEmailRequest.isMarkAsImportant,
-          displayMode: createEmailRequest.displayMode
+          displayMode: createEmailRequest.displayMode,
           composerIndex: createEmailRequest.composerIndex,
           composerId: createEmailRequest.composerId,
         ));

lib/features/composer/presentation/composer_bindings.dart

@@ -84,7 +84,7 @@ class ComposerBindings extends BaseBindings {
   @override
   void bindingsDataSourceImpl() {
     Get.lazyPut(() => AttachmentUploadDataSourceImpl(
-      Get.find<FileUploader>(tag: composerId),
+      Get.find<FileUploader>(),
       Get.find<Uuid>(),
       Get.find<RemoteExceptionThrower>(),
     ), tag: composerId);
@@ -142,6 +142,10 @@ class ComposerBindings extends BaseBindings {
       Get.find<SessionStorageManager>(),
       Get.find<CacheExceptionThrower>(),
     ), tag: composerId);
+    Get.lazyPut(() => SessionStorageComposerDatasourceImpl(
+      Get.find<HtmlTransform>(),
+      Get.find<CacheExceptionThrower>(),
+    ), tag: composerId);
   }
 
   @override
@@ -178,6 +182,10 @@ class ComposerBindings extends BaseBindings {
       () => Get.find<PrintFileDataSourceImpl>(tag: composerId),
       tag: composerId,
     );
+    Get.lazyPut<SessionStorageComposerDatasource>(
+      () => Get.find<SessionStorageComposerDatasourceImpl>(tag: composerId),
+      tag: composerId,
+    );
   }
 
   @override
@@ -293,7 +301,7 @@ class ComposerBindings extends BaseBindings {
     );
 
     IdentityInteractorsBindings(composerId: composerId).dependencies();
-    PreferencesInteractorsBindings().dependencies();
+    PreferencesInteractorsBindings(composerId: composerId).dependencies();
   }
 
   @override
@@ -347,7 +355,6 @@ class ComposerBindings extends BaseBindings {
     Get.delete<EmailHiveCacheDataSourceImpl>(tag: composerId);
     Get.delete<EmailLocalStorageDataSourceImpl>(tag: composerId);
     Get.delete<EmailSessionStorageDatasourceImpl>(tag: composerId);
-    Get.delete<RemoteServerSettingsDataSourceImpl>(tag: composerId);
     Get.delete<SessionStorageComposerDatasourceImpl>(tag: composerId);
 
     Get.delete<AttachmentUploadDataSource>(tag: composerId);
@@ -358,7 +365,6 @@ class ComposerBindings extends BaseBindings {
     Get.delete<HtmlDataSource>(tag: composerId);
     Get.delete<StateDataSource>(tag: composerId);
     Get.delete<PrintFileDataSource>(tag: composerId);
-    Get.delete<ServerSettingsDataSource>(tag: composerId);
     Get.delete<SessionStorageComposerDatasource>(tag: composerId);
 
     Get.delete<ComposerRepositoryImpl>(tag: composerId);
@@ -366,14 +372,12 @@ class ComposerBindings extends BaseBindings {
     Get.delete<ContactRepositoryImpl>(tag: composerId);
     Get.delete<MailboxRepositoryImpl>(tag: composerId);
     Get.delete<EmailRepositoryImpl>(tag: composerId);
-    Get.delete<ServerSettingsRepositoryImpl>(tag: composerId);
 
     Get.delete<ComposerRepository>(tag: composerId);
     Get.delete<ComposerCacheRepository>(tag: composerId);
     Get.delete<ContactRepository>(tag: composerId);
     Get.delete<MailboxRepository>(tag: composerId);
     Get.delete<EmailRepository>(tag: composerId);
-    Get.delete<ServerSettingsRepository>(tag: composerId);
 
     Get.delete<LocalFilePickerInteractor>(tag: composerId);
     Get.delete<LocalImagePickerInteractor>(tag: composerId);
@@ -383,14 +387,12 @@ class ComposerBindings extends BaseBindings {
     Get.delete<SaveComposerCacheOnWebInteractor>(tag: composerId);
     Get.delete<DownloadImageAsBase64Interactor>(tag: composerId);
     Get.delete<TransformHtmlEmailContentInteractor>(tag: composerId);
-    Get.delete<GetAlwaysReadReceiptSettingInteractor>(tag: composerId);
     Get.delete<CreateNewAndSendEmailInteractor>(tag: composerId);
     Get.delete<CreateNewAndSaveEmailToDraftsInteractor>(tag: composerId);
     Get.delete<RestoreEmailInlineImagesInteractor>(tag: composerId);
     Get.delete<PrintEmailInteractor>(tag: composerId);
 
-    Get.delete<FileUploader>(tag: composerId);
-
     IdentityInteractorsBindings(composerId: composerId).dispose();
+    PreferencesInteractorsBindings(composerId: composerId).dispose();
   }
 }

lib/features/mailbox_dashboard/data/model/composer_cache.dart

@@ -19,7 +19,7 @@ class ComposerCache with EquatableMixin {
     this.email,
     this.hasRequestReadReceipt,
     this.isMarkAsImportant,
-    this.displayMode = ScreenDisplayMode.normal
+    this.displayMode = ScreenDisplayMode.normal,
     this.composerIndex,
     this.composerId,
   });
@@ -33,7 +33,7 @@ class ComposerCache with EquatableMixin {
     email,
     hasRequestReadReceipt,
     isMarkAsImportant,
-    displayMode
+    displayMode,
     composerIndex,
     composerId,
   ];

lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart

@@ -84,7 +84,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
                         ComposeButtonWidget(
                           imagePaths: controller.imagePaths,
                           onTapAction: () =>
-                            controller.goToComposer(ComposerArguments()),
+                            controller.openComposer(ComposerArguments()),
                         ),
                         Expanded(child: SizedBox(
                           width: ResponsiveUtils.defaultSizeMenu,

lib/features/manage_account/presentation/preferences/bindings/preferences_interactors_bindings.dart

@@ -11,32 +11,60 @@ import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart';
 
 class PreferencesInteractorsBindings extends InteractorsBindings {
 
+  final String? composerId;
+
+  PreferencesInteractorsBindings({this.composerId});
+
   @override
   void bindingsDataSource() {
-    Get.lazyPut<ServerSettingsDataSource>(() => Get.find<RemoteServerSettingsDataSourceImpl>());
+    Get.lazyPut<ServerSettingsDataSource>(
+      () => Get.find<RemoteServerSettingsDataSourceImpl>(tag: composerId),
+      tag: composerId,
+    );
   }
 
   @override
   void bindingsDataSourceImpl() {
     Get.lazyPut(() => RemoteServerSettingsDataSourceImpl(
-      Get.find<ServerSettingsAPI>(), 
+      Get.find<ServerSettingsAPI>(),
       Get.find<RemoteExceptionThrower>(),
-    ));
+    ), tag: composerId);
   }
 
   @override
   void bindingsInteractor() {
-    Get.lazyPut(() => GetServerSettingInteractor(Get.find<ServerSettingsRepository>()));
+    Get.lazyPut(
-    Get.lazyPut(() => UpdateServerSettingInteractor(Get.find<ServerSettingsRepository>()));
+      () => GetServerSettingInteractor(Get.find<ServerSettingsRepository>(tag: composerId)),
+      tag: composerId,
+    );
+    Get.lazyPut(
+      () => UpdateServerSettingInteractor(Get.find<ServerSettingsRepository>(tag: composerId)),
+      tag: composerId,
+    );
   }
 
   @override
   void bindingsRepository() {
-    Get.lazyPut<ServerSettingsRepository>(() => Get.find<ServerSettingsRepositoryImpl>());
+    Get.lazyPut<ServerSettingsRepository>(
+      () => Get.find<ServerSettingsRepositoryImpl>(tag: composerId),
+      tag: composerId,
+    );
   }
 
   @override
   void bindingsRepositoryImpl() {
-    Get.lazyPut(() => ServerSettingsRepositoryImpl(Get.find<ServerSettingsDataSource>()));
+    Get.lazyPut(
+      () => ServerSettingsRepositoryImpl(Get.find<ServerSettingsDataSource>(tag: composerId)),
+      tag: composerId,
+    );
+  }
+
+  void dispose() {
+    Get.delete<RemoteServerSettingsDataSourceImpl>(tag: composerId);
+    Get.delete<ServerSettingsDataSource>(tag: composerId);
+    Get.delete<ServerSettingsRepositoryImpl>(tag: composerId);
+    Get.delete<ServerSettingsRepository>(tag: composerId);
+    Get.delete<UpdateServerSettingInteractor>(tag: composerId);
+    Get.delete<GetServerSettingInteractor>(tag: composerId);
   }
 }

test/features/composer/presentation/composer_controller_test.dart

@@ -419,7 +419,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -480,7 +480,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -542,7 +542,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -603,7 +603,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -905,7 +905,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -977,7 +977,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -1051,7 +1051,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -1129,7 +1129,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -1494,7 +1494,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -1546,7 +1546,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -1599,7 +1599,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,
@@ -1656,7 +1656,7 @@ void main() {
             mockSaveComposerCacheOnWebInteractor,
             mockDownloadImageAsBase64Interactor,
             mockTransformHtmlEmailContentInteractor,
-            mockGetAlwaysReadReceiptSettingInteractor,
+            mockGetServerSettingInteractor,
             mockCreateNewAndSendEmailInteractor,
             mockCreateNewAndSaveEmailToDraftsInteractor,
             mockPrintEmailInteractor,