Skip to content

Commit 0bd1ab7

Browse files
dab246hoangdat
dab246
authored and
hoangdat
committed
TF-3480 Fix conflict when rebase master
Signed-off-by: dab246 <tdvu@linagora.com>
1 parent f0fb43a commit 0bd1ab7

File tree

6 files changed

+62
-32
lines changed

6 files changed

+62
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SaveComposerCacheOnWebInteractor {
3636
email: emailCreated,
3737
hasRequestReadReceipt: createEmailRequest.hasRequestReadReceipt,
3838
isMarkAsImportant: createEmailRequest.isMarkAsImportant,
39-
displayMode: createEmailRequest.displayMode
39+
displayMode: createEmailRequest.displayMode,
4040
composerIndex: createEmailRequest.composerIndex,
4141
composerId: createEmailRequest.composerId,
4242
));

‎lib/features/composer/presentation/composer_bindings.dart‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ComposerBindings extends BaseBindings {
8484
@override
8585
void bindingsDataSourceImpl() {
8686
Get.lazyPut(() => AttachmentUploadDataSourceImpl(
87-
Get.find<FileUploader>(tag: composerId),
87+
Get.find<FileUploader>(),
8888
Get.find<Uuid>(),
8989
Get.find<RemoteExceptionThrower>(),
9090
), tag: composerId);
@@ -142,6 +142,10 @@ class ComposerBindings extends BaseBindings {
142142
Get.find<SessionStorageManager>(),
143143
Get.find<CacheExceptionThrower>(),
144144
), tag: composerId);
145+
Get.lazyPut(() => SessionStorageComposerDatasourceImpl(
146+
Get.find<HtmlTransform>(),
147+
Get.find<CacheExceptionThrower>(),
148+
), tag: composerId);
145149
}
146150

147151
@override
@@ -178,6 +182,10 @@ class ComposerBindings extends BaseBindings {
178182
() => Get.find<PrintFileDataSourceImpl>(tag: composerId),
179183
tag: composerId,
180184
);
185+
Get.lazyPut<SessionStorageComposerDatasource>(
186+
() => Get.find<SessionStorageComposerDatasourceImpl>(tag: composerId),
187+
tag: composerId,
188+
);
181189
}
182190

183191
@override
@@ -293,7 +301,7 @@ class ComposerBindings extends BaseBindings {
293301
);
294302

295303
IdentityInteractorsBindings(composerId: composerId).dependencies();
296-
PreferencesInteractorsBindings().dependencies();
304+
PreferencesInteractorsBindings(composerId: composerId).dependencies();
297305
}
298306

299307
@override
@@ -347,7 +355,6 @@ class ComposerBindings extends BaseBindings {
347355
Get.delete<EmailHiveCacheDataSourceImpl>(tag: composerId);
348356
Get.delete<EmailLocalStorageDataSourceImpl>(tag: composerId);
349357
Get.delete<EmailSessionStorageDatasourceImpl>(tag: composerId);
350-
Get.delete<RemoteServerSettingsDataSourceImpl>(tag: composerId);
351358
Get.delete<SessionStorageComposerDatasourceImpl>(tag: composerId);
352359

353360
Get.delete<AttachmentUploadDataSource>(tag: composerId);
@@ -358,22 +365,19 @@ class ComposerBindings extends BaseBindings {
358365
Get.delete<HtmlDataSource>(tag: composerId);
359366
Get.delete<StateDataSource>(tag: composerId);
360367
Get.delete<PrintFileDataSource>(tag: composerId);
361-
Get.delete<ServerSettingsDataSource>(tag: composerId);
362368
Get.delete<SessionStorageComposerDatasource>(tag: composerId);
363369

364370
Get.delete<ComposerRepositoryImpl>(tag: composerId);
365371
Get.delete<ComposerCacheRepositoryImpl>(tag: composerId);
366372
Get.delete<ContactRepositoryImpl>(tag: composerId);
367373
Get.delete<MailboxRepositoryImpl>(tag: composerId);
368374
Get.delete<EmailRepositoryImpl>(tag: composerId);
369-
Get.delete<ServerSettingsRepositoryImpl>(tag: composerId);
370375

371376
Get.delete<ComposerRepository>(tag: composerId);
372377
Get.delete<ComposerCacheRepository>(tag: composerId);
373378
Get.delete<ContactRepository>(tag: composerId);
374379
Get.delete<MailboxRepository>(tag: composerId);
375380
Get.delete<EmailRepository>(tag: composerId);
376-
Get.delete<ServerSettingsRepository>(tag: composerId);
377381

378382
Get.delete<LocalFilePickerInteractor>(tag: composerId);
379383
Get.delete<LocalImagePickerInteractor>(tag: composerId);
@@ -383,14 +387,12 @@ class ComposerBindings extends BaseBindings {
383387
Get.delete<SaveComposerCacheOnWebInteractor>(tag: composerId);
384388
Get.delete<DownloadImageAsBase64Interactor>(tag: composerId);
385389
Get.delete<TransformHtmlEmailContentInteractor>(tag: composerId);
386-
Get.delete<GetAlwaysReadReceiptSettingInteractor>(tag: composerId);
387390
Get.delete<CreateNewAndSendEmailInteractor>(tag: composerId);
388391
Get.delete<CreateNewAndSaveEmailToDraftsInteractor>(tag: composerId);
389392
Get.delete<RestoreEmailInlineImagesInteractor>(tag: composerId);
390393
Get.delete<PrintEmailInteractor>(tag: composerId);
391394

392-
Get.delete<FileUploader>(tag: composerId);
393-
394395
IdentityInteractorsBindings(composerId: composerId).dispose();
396+
PreferencesInteractorsBindings(composerId: composerId).dispose();
395397
}
396398
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ComposerCache with EquatableMixin {
1919
this.email,
2020
this.hasRequestReadReceipt,
2121
this.isMarkAsImportant,
22-
this.displayMode = ScreenDisplayMode.normal
22+
this.displayMode = ScreenDisplayMode.normal,
2323
this.composerIndex,
2424
this.composerId,
2525
});
@@ -33,7 +33,7 @@ class ComposerCache with EquatableMixin {
3333
email,
3434
hasRequestReadReceipt,
3535
isMarkAsImportant,
36-
displayMode
36+
displayMode,
3737
composerIndex,
3838
composerId,
3939
];

‎lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
8484
ComposeButtonWidget(
8585
imagePaths: controller.imagePaths,
8686
onTapAction: () =>
87-
controller.goToComposer(ComposerArguments()),
87+
controller.openComposer(ComposerArguments()),
8888
),
8989
Expanded(child: SizedBox(
9090
width: ResponsiveUtils.defaultSizeMenu,

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

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,60 @@ import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart';
1111

1212
class PreferencesInteractorsBindings extends InteractorsBindings {
1313

14+
final String? composerId;
15+
16+
PreferencesInteractorsBindings({this.composerId});
17+
1418
@override
1519
void bindingsDataSource() {
16-
Get.lazyPut<ServerSettingsDataSource>(() => Get.find<RemoteServerSettingsDataSourceImpl>());
20+
Get.lazyPut<ServerSettingsDataSource>(
21+
() => Get.find<RemoteServerSettingsDataSourceImpl>(tag: composerId),
22+
tag: composerId,
23+
);
1724
}
1825

1926
@override
2027
void bindingsDataSourceImpl() {
2128
Get.lazyPut(() => RemoteServerSettingsDataSourceImpl(
22-
Get.find<ServerSettingsAPI>(),
29+
Get.find<ServerSettingsAPI>(),
2330
Get.find<RemoteExceptionThrower>(),
24-
));
31+
), tag: composerId);
2532
}
2633

2734
@override
2835
void bindingsInteractor() {
29-
Get.lazyPut(() => GetServerSettingInteractor(Get.find<ServerSettingsRepository>()));
30-
Get.lazyPut(() => UpdateServerSettingInteractor(Get.find<ServerSettingsRepository>()));
36+
Get.lazyPut(
37+
() => GetServerSettingInteractor(Get.find<ServerSettingsRepository>(tag: composerId)),
38+
tag: composerId,
39+
);
40+
Get.lazyPut(
41+
() => UpdateServerSettingInteractor(Get.find<ServerSettingsRepository>(tag: composerId)),
42+
tag: composerId,
43+
);
3144
}
3245

3346
@override
3447
void bindingsRepository() {
35-
Get.lazyPut<ServerSettingsRepository>(() => Get.find<ServerSettingsRepositoryImpl>());
48+
Get.lazyPut<ServerSettingsRepository>(
49+
() => Get.find<ServerSettingsRepositoryImpl>(tag: composerId),
50+
tag: composerId,
51+
);
3652
}
3753

3854
@override
3955
void bindingsRepositoryImpl() {
40-
Get.lazyPut(() => ServerSettingsRepositoryImpl(Get.find<ServerSettingsDataSource>()));
56+
Get.lazyPut(
57+
() => ServerSettingsRepositoryImpl(Get.find<ServerSettingsDataSource>(tag: composerId)),
58+
tag: composerId,
59+
);
60+
}
61+
62+
void dispose() {
63+
Get.delete<RemoteServerSettingsDataSourceImpl>(tag: composerId);
64+
Get.delete<ServerSettingsDataSource>(tag: composerId);
65+
Get.delete<ServerSettingsRepositoryImpl>(tag: composerId);
66+
Get.delete<ServerSettingsRepository>(tag: composerId);
67+
Get.delete<UpdateServerSettingInteractor>(tag: composerId);
68+
Get.delete<GetServerSettingInteractor>(tag: composerId);
4169
}
4270
}

‎test/features/composer/presentation/composer_controller_test.dart‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ void main() {
419419
mockSaveComposerCacheOnWebInteractor,
420420
mockDownloadImageAsBase64Interactor,
421421
mockTransformHtmlEmailContentInteractor,
422-
mockGetAlwaysReadReceiptSettingInteractor,
422+
mockGetServerSettingInteractor,
423423
mockCreateNewAndSendEmailInteractor,
424424
mockCreateNewAndSaveEmailToDraftsInteractor,
425425
mockPrintEmailInteractor,
@@ -480,7 +480,7 @@ void main() {
480480
mockSaveComposerCacheOnWebInteractor,
481481
mockDownloadImageAsBase64Interactor,
482482
mockTransformHtmlEmailContentInteractor,
483-
mockGetAlwaysReadReceiptSettingInteractor,
483+
mockGetServerSettingInteractor,
484484
mockCreateNewAndSendEmailInteractor,
485485
mockCreateNewAndSaveEmailToDraftsInteractor,
486486
mockPrintEmailInteractor,
@@ -542,7 +542,7 @@ void main() {
542542
mockSaveComposerCacheOnWebInteractor,
543543
mockDownloadImageAsBase64Interactor,
544544
mockTransformHtmlEmailContentInteractor,
545-
mockGetAlwaysReadReceiptSettingInteractor,
545+
mockGetServerSettingInteractor,
546546
mockCreateNewAndSendEmailInteractor,
547547
mockCreateNewAndSaveEmailToDraftsInteractor,
548548
mockPrintEmailInteractor,
@@ -603,7 +603,7 @@ void main() {
603603
mockSaveComposerCacheOnWebInteractor,
604604
mockDownloadImageAsBase64Interactor,
605605
mockTransformHtmlEmailContentInteractor,
606-
mockGetAlwaysReadReceiptSettingInteractor,
606+
mockGetServerSettingInteractor,
607607
mockCreateNewAndSendEmailInteractor,
608608
mockCreateNewAndSaveEmailToDraftsInteractor,
609609
mockPrintEmailInteractor,
@@ -905,7 +905,7 @@ void main() {
905905
mockSaveComposerCacheOnWebInteractor,
906906
mockDownloadImageAsBase64Interactor,
907907
mockTransformHtmlEmailContentInteractor,
908-
mockGetAlwaysReadReceiptSettingInteractor,
908+
mockGetServerSettingInteractor,
909909
mockCreateNewAndSendEmailInteractor,
910910
mockCreateNewAndSaveEmailToDraftsInteractor,
911911
mockPrintEmailInteractor,
@@ -977,7 +977,7 @@ void main() {
977977
mockSaveComposerCacheOnWebInteractor,
978978
mockDownloadImageAsBase64Interactor,
979979
mockTransformHtmlEmailContentInteractor,
980-
mockGetAlwaysReadReceiptSettingInteractor,
980+
mockGetServerSettingInteractor,
981981
mockCreateNewAndSendEmailInteractor,
982982
mockCreateNewAndSaveEmailToDraftsInteractor,
983983
mockPrintEmailInteractor,
@@ -1051,7 +1051,7 @@ void main() {
10511051
mockSaveComposerCacheOnWebInteractor,
10521052
mockDownloadImageAsBase64Interactor,
10531053
mockTransformHtmlEmailContentInteractor,
1054-
mockGetAlwaysReadReceiptSettingInteractor,
1054+
mockGetServerSettingInteractor,
10551055
mockCreateNewAndSendEmailInteractor,
10561056
mockCreateNewAndSaveEmailToDraftsInteractor,
10571057
mockPrintEmailInteractor,
@@ -1129,7 +1129,7 @@ void main() {
11291129
mockSaveComposerCacheOnWebInteractor,
11301130
mockDownloadImageAsBase64Interactor,
11311131
mockTransformHtmlEmailContentInteractor,
1132-
mockGetAlwaysReadReceiptSettingInteractor,
1132+
mockGetServerSettingInteractor,
11331133
mockCreateNewAndSendEmailInteractor,
11341134
mockCreateNewAndSaveEmailToDraftsInteractor,
11351135
mockPrintEmailInteractor,
@@ -1494,7 +1494,7 @@ void main() {
14941494
mockSaveComposerCacheOnWebInteractor,
14951495
mockDownloadImageAsBase64Interactor,
14961496
mockTransformHtmlEmailContentInteractor,
1497-
mockGetAlwaysReadReceiptSettingInteractor,
1497+
mockGetServerSettingInteractor,
14981498
mockCreateNewAndSendEmailInteractor,
14991499
mockCreateNewAndSaveEmailToDraftsInteractor,
15001500
mockPrintEmailInteractor,
@@ -1546,7 +1546,7 @@ void main() {
15461546
mockSaveComposerCacheOnWebInteractor,
15471547
mockDownloadImageAsBase64Interactor,
15481548
mockTransformHtmlEmailContentInteractor,
1549-
mockGetAlwaysReadReceiptSettingInteractor,
1549+
mockGetServerSettingInteractor,
15501550
mockCreateNewAndSendEmailInteractor,
15511551
mockCreateNewAndSaveEmailToDraftsInteractor,
15521552
mockPrintEmailInteractor,
@@ -1599,7 +1599,7 @@ void main() {
15991599
mockSaveComposerCacheOnWebInteractor,
16001600
mockDownloadImageAsBase64Interactor,
16011601
mockTransformHtmlEmailContentInteractor,
1602-
mockGetAlwaysReadReceiptSettingInteractor,
1602+
mockGetServerSettingInteractor,
16031603
mockCreateNewAndSendEmailInteractor,
16041604
mockCreateNewAndSaveEmailToDraftsInteractor,
16051605
mockPrintEmailInteractor,
@@ -1656,7 +1656,7 @@ void main() {
16561656
mockSaveComposerCacheOnWebInteractor,
16571657
mockDownloadImageAsBase64Interactor,
16581658
mockTransformHtmlEmailContentInteractor,
1659-
mockGetAlwaysReadReceiptSettingInteractor,
1659+
mockGetServerSettingInteractor,
16601660
mockCreateNewAndSendEmailInteractor,
16611661
mockCreateNewAndSaveEmailToDraftsInteractor,
16621662
mockPrintEmailInteractor,

0 commit comments

Comments
 (0)