diff --git a/lib/features/composer/presentation/composer_bindings.dart b/lib/features/composer/presentation/composer_bindings.dart index 86421b9a0..0fc285310 100644 --- a/lib/features/composer/presentation/composer_bindings.dart +++ b/lib/features/composer/presentation/composer_bindings.dart @@ -49,6 +49,8 @@ import 'package:tmail_ui_user/features/upload/data/network/file_uploader.dart'; import 'package:tmail_ui_user/features/upload/domain/usecases/local_file_picker_interactor.dart'; import 'package:tmail_ui_user/features/upload/presentation/controller/upload_controller.dart'; import 'package:tmail_ui_user/main/bindings/network/binding_tag.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; +import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; import 'package:uuid/uuid.dart'; import 'package:worker_manager/worker_manager.dart'; @@ -69,8 +71,13 @@ class ComposerBindings extends BaseBindings { Get.lazyPut(() => AttachmentUploadDataSourceImpl(Get.find())); Get.lazyPut(() => ComposerDataSourceImpl(Get.find())); Get.lazyPut(() => ContactDataSourceImpl()); - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => EmailDataSourceImpl(Get.find())); Get.lazyPut(() => HtmlDataSourceImpl( Get.find(), diff --git a/lib/features/destination_picker/presentation/destination_picker_bindings.dart b/lib/features/destination_picker/presentation/destination_picker_bindings.dart index 2268fff60..1e0fd4586 100644 --- a/lib/features/destination_picker/presentation/destination_picker_bindings.dart +++ b/lib/features/destination_picker/presentation/destination_picker_bindings.dart @@ -26,6 +26,7 @@ import 'package:tmail_ui_user/features/thread/data/datasource/thread_datasource. import 'package:tmail_ui_user/features/thread/data/datasource_impl/thread_datasource_impl.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_isolate_worker.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; class DestinationPickerBindings extends BaseBindings { @@ -62,8 +63,13 @@ class DestinationPickerBindings extends BaseBindings { @override void bindingsDataSourceImpl() { - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => StateDataSourceImpl(Get.find())); Get.lazyPut(() => EmailDataSourceImpl(Get.find())); Get.lazyPut(() => ThreadDataSourceImpl( diff --git a/lib/features/email/presentation/email_bindings.dart b/lib/features/email/presentation/email_bindings.dart index f27ce6e33..02a221638 100644 --- a/lib/features/email/presentation/email_bindings.dart +++ b/lib/features/email/presentation/email_bindings.dart @@ -46,6 +46,8 @@ import 'package:tmail_ui_user/features/mailbox/data/repository/mailbox_repositor import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart'; import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_identities_interactor.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/profiles/identities/identity_interactors_bindings.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; +import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; class EmailBindings extends BaseBindings { @@ -76,8 +78,13 @@ class EmailBindings extends BaseBindings { @override void bindingsDataSourceImpl() { - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => EmailDataSourceImpl(Get.find())); Get.lazyPut(() => HiveAccountDatasourceImpl(Get.find())); Get.lazyPut(() => HtmlDataSourceImpl( diff --git a/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart index 4c0c8ab18..d9a4b5265 100644 --- a/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart +++ b/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart @@ -16,12 +16,14 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_r import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart'; +import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart'; class MailboxCacheDataSourceImpl extends MailboxDataSource { final MailboxCacheManager _mailboxCacheManager; + final ExceptionThrower _exceptionThrower; - MailboxCacheDataSourceImpl(this._mailboxCacheManager); + MailboxCacheDataSourceImpl(this._mailboxCacheManager, this._exceptionThrower); @override Future getAllMailbox(AccountId accountId, {Properties? properties}) { @@ -38,7 +40,7 @@ class MailboxCacheDataSourceImpl extends MailboxDataSource { return Future.sync(() async { return await _mailboxCacheManager.update(updated: updated, created: created, destroyed: destroyed); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -48,7 +50,7 @@ class MailboxCacheDataSourceImpl extends MailboxDataSource { final listMailboxes = await _mailboxCacheManager.getAllMailbox(); return listMailboxes; }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } diff --git a/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart index 4dbc7cdfc..950522788 100644 --- a/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart +++ b/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart @@ -17,20 +17,22 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_r import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart'; +import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart'; class MailboxDataSourceImpl extends MailboxDataSource { final MailboxAPI mailboxAPI; final MailboxIsolateWorker _mailboxIsolateWorker; + final ExceptionThrower _exceptionThrower; - MailboxDataSourceImpl(this.mailboxAPI, this._mailboxIsolateWorker); + MailboxDataSourceImpl(this.mailboxAPI, this._mailboxIsolateWorker, this._exceptionThrower); @override Future getAllMailbox(AccountId accountId, {Properties? properties}) { return Future.sync(() async { return await mailboxAPI.getAllMailbox(accountId, properties: properties); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -39,7 +41,7 @@ class MailboxDataSourceImpl extends MailboxDataSource { return Future.sync(() async { return await mailboxAPI.getChanges(accountId, sinceState); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -58,7 +60,7 @@ class MailboxDataSourceImpl extends MailboxDataSource { return Future.sync(() async { return await mailboxAPI.createNewMailbox(accountId, newMailboxRequest); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -67,7 +69,7 @@ class MailboxDataSourceImpl extends MailboxDataSource { return Future.sync(() async { return await mailboxAPI.deleteMultipleMailbox(session, accountId, mailboxIds); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -76,7 +78,7 @@ class MailboxDataSourceImpl extends MailboxDataSource { return Future.sync(() async { return await mailboxAPI.renameMailbox(accountId, request); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -85,7 +87,7 @@ class MailboxDataSourceImpl extends MailboxDataSource { return Future.sync(() async { return await mailboxAPI.moveMailbox(accountId, request); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } @@ -102,7 +104,7 @@ class MailboxDataSourceImpl extends MailboxDataSource { totalEmailUnread, onProgressController); }).catchError((error) { - throw error; + _exceptionThrower.throwException(error); }); } } \ No newline at end of file diff --git a/lib/features/mailbox/presentation/mailbox_bindings.dart b/lib/features/mailbox/presentation/mailbox_bindings.dart index 1919074e7..1bac78745 100644 --- a/lib/features/mailbox/presentation/mailbox_bindings.dart +++ b/lib/features/mailbox/presentation/mailbox_bindings.dart @@ -29,6 +29,7 @@ import 'package:tmail_ui_user/features/thread/data/datasource/thread_datasource. import 'package:tmail_ui_user/features/thread/data/datasource_impl/thread_datasource_impl.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_isolate_worker.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; class MailboxBindings extends BaseBindings { @@ -68,8 +69,13 @@ class MailboxBindings extends BaseBindings { @override void bindingsDataSourceImpl() { - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => StateDataSourceImpl(Get.find())); Get.lazyPut(() => EmailDataSourceImpl(Get.find())); Get.lazyPut(() => ThreadDataSourceImpl( diff --git a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart index 891113c3e..a1b29c1e3 100644 --- a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart +++ b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart @@ -88,6 +88,7 @@ import 'package:tmail_ui_user/features/thread/domain/usecases/move_multiple_emai import 'package:tmail_ui_user/features/thread/domain/usecases/search_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/domain/usecases/search_more_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/presentation/thread_bindings.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; class MailboxDashBoardBindings extends BaseBindings { @@ -156,8 +157,13 @@ class MailboxDashBoardBindings extends BaseBindings { Get.find())); Get.lazyPut(() => LocalThreadDataSourceImpl(Get.find())); Get.lazyPut(() => StateDataSourceImpl(Get.find())); - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => HiveAccountDatasourceImpl(Get.find())); Get.lazyPut(() => AuthenticationOIDCDataSourceImpl( Get.find(), diff --git a/lib/features/rules_filter_creator/presentation/rules_filter_creator_bindings.dart b/lib/features/rules_filter_creator/presentation/rules_filter_creator_bindings.dart index 8f1e4e707..f07af703a 100644 --- a/lib/features/rules_filter_creator/presentation/rules_filter_creator_bindings.dart +++ b/lib/features/rules_filter_creator/presentation/rules_filter_creator_bindings.dart @@ -16,6 +16,8 @@ import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_i import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart'; import 'package:tmail_ui_user/features/mailbox_creator/domain/usecases/verify_name_interactor.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; +import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; class RulesFilterCreatorBindings extends BaseBindings { @@ -46,8 +48,13 @@ class RulesFilterCreatorBindings extends BaseBindings { @override void bindingsDataSourceImpl() { - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => StateDataSourceImpl(Get.find())); } diff --git a/lib/features/thread/presentation/thread_bindings.dart b/lib/features/thread/presentation/thread_bindings.dart index 100e0f46b..93f11e73c 100644 --- a/lib/features/thread/presentation/thread_bindings.dart +++ b/lib/features/thread/presentation/thread_bindings.dart @@ -43,6 +43,7 @@ import 'package:tmail_ui_user/features/thread/domain/usecases/refresh_changes_em import 'package:tmail_ui_user/features/thread/domain/usecases/search_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/domain/usecases/search_more_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/presentation/thread_controller.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; class ThreadBindings extends BaseBindings { @@ -78,8 +79,13 @@ class ThreadBindings extends BaseBindings { @override void bindingsDataSourceImpl() { - Get.lazyPut(() => MailboxDataSourceImpl(Get.find(), Get.find())); - Get.lazyPut(() => MailboxCacheDataSourceImpl(Get.find())); + Get.lazyPut(() => MailboxDataSourceImpl( + Get.find(), + Get.find(), + Get.find())); + Get.lazyPut(() => MailboxCacheDataSourceImpl( + Get.find(), + Get.find())); Get.lazyPut(() => ThreadDataSourceImpl( Get.find(), Get.find(), diff --git a/lib/main/bindings/local/local_bindings.dart b/lib/main/bindings/local/local_bindings.dart index 2c1ade7ad..ae54925c8 100644 --- a/lib/main/bindings/local/local_bindings.dart +++ b/lib/main/bindings/local/local_bindings.dart @@ -23,12 +23,14 @@ import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart'; import 'package:tmail_ui_user/features/manage_account/data/local/language_cache_manager.dart'; import 'package:tmail_ui_user/features/thread/data/local/email_cache_manager.dart'; +import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; class LocalBindings extends Bindings { @override void dependencies() { _bindingCaching(); + _bindingException(); } void _bindingCaching() { @@ -61,4 +63,8 @@ class LocalBindings extends Bindings { Get.find(), )); } + + void _bindingException() { + Get.put(CacheExceptionThrower()); + } } \ No newline at end of file diff --git a/lib/main/exceptions/cache_exception_thrower.dart b/lib/main/exceptions/cache_exception_thrower.dart index 1e823710c..82a63bd28 100644 --- a/lib/main/exceptions/cache_exception_thrower.dart +++ b/lib/main/exceptions/cache_exception_thrower.dart @@ -4,7 +4,7 @@ import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart'; class CacheExceptionThrower extends ExceptionThrower { @override - void throwException(dynamic exception) { - throw UnknownCacheError(message: exception.toString()); + void throwException(dynamic error) { + throw UnknownCacheError(message: error.toString()); } } \ No newline at end of file diff --git a/lib/main/exceptions/exception_thrower.dart b/lib/main/exceptions/exception_thrower.dart index 2a1294686..0f71f88e0 100644 --- a/lib/main/exceptions/exception_thrower.dart +++ b/lib/main/exceptions/exception_thrower.dart @@ -1,4 +1,4 @@ abstract class ExceptionThrower { - void throwException(dynamic exception); + void throwException(dynamic error); } diff --git a/lib/main/exceptions/remote_exception_thrower.dart b/lib/main/exceptions/remote_exception_thrower.dart index 50903378d..8790610fc 100644 --- a/lib/main/exceptions/remote_exception_thrower.dart +++ b/lib/main/exceptions/remote_exception_thrower.dart @@ -8,22 +8,22 @@ import 'package:tmail_ui_user/main/exceptions/remote_exception.dart'; class RemoteExceptionThrower extends ExceptionThrower { @override - void throwException(dynamic exception) { - if (exception is DioError) { - switch (exception.type) { + void throwException(dynamic error) { + if (error is DioError) { + switch (error.type) { case DioErrorType.connectTimeout: throw const ConnectError(); default: - if (exception.response?.statusCode == 502) { + if (error.response?.statusCode == 502) { throw BadGateway(); } else { throw UnknownError( - code: exception.response?.statusCode, - message: exception.response?.statusMessage); + code: error.response?.statusCode, + message: error.response?.statusMessage); } } - } else if (exception is ErrorMethodResponseException) { - final errorResponse = exception.errorResponse as ErrorMethodResponse; + } else if (error is ErrorMethodResponseException) { + final errorResponse = error.errorResponse as ErrorMethodResponse; if (errorResponse is CannotCalculateChangesMethodResponse) { throw CannotCalculateChangesMethodResponseException(); } else { @@ -32,7 +32,7 @@ class RemoteExceptionThrower extends ExceptionThrower { message: errorResponse.description); } } else { - throw UnknownError(message: exception.toString()); + throw UnknownError(message: error.toString()); } } } \ No newline at end of file