From 5b01715dcd3f8361bae5154732308070b9968973 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 9 May 2023 18:26:44 +0700 Subject: [PATCH] TF-1810 Move all hive clients to a separate folder (cherry picked from commit c72e16b576835b7748e20ab3e5cce5e1f505a65f) --- lib/features/caching/caching_manager.dart | 16 ++++++------ .../{ => clients}/account_cache_client.dart | 0 .../authentication_info_cache_client.dart | 0 .../{ => clients}/cache_version_client.dart | 0 .../{ => clients}/email_cache_client.dart | 0 .../encryption_key_cache_client.dart | 0 .../{ => clients}/fcm_cache_client.dart | 0 .../hive_cache_version_client.dart | 2 +- .../{ => clients}/mailbox_cache_client.dart | 0 .../recent_login_url_cache_client.dart | 0 .../recent_login_username_cache_client.dart | 0 .../recent_search_cache_client.dart | 0 .../{ => clients}/state_cache_client.dart | 0 .../subscription_cache_client.dart | 0 .../token_oidc_cache_client.dart | 0 .../local/recent_login_url_cache_manager.dart | 2 +- .../recent_login_username_cache_manager.dart | 2 +- .../local/recent_search_cache_manager.dart | 2 +- .../presentation/composer_bindings.dart | 2 +- .../destination_picker_bindings.dart | 2 +- .../email/presentation/email_bindings.dart | 2 +- .../login_url_datasource_impl.dart | 2 +- .../login_username_datasource_impl.dart | 2 +- .../data/local/account_cache_manager.dart | 2 +- .../authentication_info_cache_manager.dart | 2 +- .../local/encryption_key_cache_manager.dart | 2 +- .../data/local/token_oidc_cache_manager.dart | 2 +- .../login/presentation/login_bindings.dart | 6 ++--- .../state_datasource_impl.dart | 2 +- .../data/local/mailbox_cache_manager.dart | 2 +- .../presentation/mailbox_bindings.dart | 2 +- .../search_datasource_impl.dart | 2 +- .../bindings/mailbox_dashboard_bindings.dart | 4 +-- ...ailbox_visibility_interactor_bindings.dart | 2 +- .../data/local/fcm_cache_manager.dart | 4 +-- .../bindings/fcm_interactor_bindings.dart | 2 +- .../rules_filter_creator_bindings.dart | 2 +- .../presentation/search_mailbox_bindings.dart | 2 +- .../data/local/email_cache_manager.dart | 2 +- .../thread/presentation/thread_bindings.dart | 2 +- lib/main/bindings/local/local_bindings.dart | 26 +++++++++---------- .../caching/email_cache_client_test.dart | 2 +- .../caching/mailbox_cache_client_test.dart | 2 +- .../offline_mode/woker_queue_test.dart | 2 +- 44 files changed, 53 insertions(+), 55 deletions(-) rename lib/features/caching/{ => clients}/account_cache_client.dart (100%) rename lib/features/caching/{ => clients}/authentication_info_cache_client.dart (100%) rename lib/features/caching/{ => clients}/cache_version_client.dart (100%) rename lib/features/caching/{ => clients}/email_cache_client.dart (100%) rename lib/features/caching/{ => clients}/encryption_key_cache_client.dart (100%) rename lib/features/caching/{ => clients}/fcm_cache_client.dart (100%) rename lib/features/caching/{ => clients}/hive_cache_version_client.dart (91%) rename lib/features/caching/{ => clients}/mailbox_cache_client.dart (100%) rename lib/features/caching/{ => clients}/recent_login_url_cache_client.dart (100%) rename lib/features/caching/{ => clients}/recent_login_username_cache_client.dart (100%) rename lib/features/caching/{ => clients}/recent_search_cache_client.dart (100%) rename lib/features/caching/{ => clients}/state_cache_client.dart (100%) rename lib/features/caching/{ => clients}/subscription_cache_client.dart (100%) rename lib/features/caching/{ => clients}/token_oidc_cache_client.dart (100%) diff --git a/lib/features/caching/caching_manager.dart b/lib/features/caching/caching_manager.dart index 12f40081d..f650e3400 100644 --- a/lib/features/caching/caching_manager.dart +++ b/lib/features/caching/caching_manager.dart @@ -1,13 +1,13 @@ import 'package:core/utils/app_logger.dart'; -import 'package:tmail_ui_user/features/caching/account_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/account_cache_client.dart'; import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart'; -import 'package:tmail_ui_user/features/caching/email_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/fcm_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/hive_cache_version_client.dart'; -import 'package:tmail_ui_user/features/caching/mailbox_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/recent_search_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/subscription_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/email_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/fcm_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/hive_cache_version_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/mailbox_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_search_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/subscription_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/model/state_type.dart'; class CachingManager { diff --git a/lib/features/caching/account_cache_client.dart b/lib/features/caching/clients/account_cache_client.dart similarity index 100% rename from lib/features/caching/account_cache_client.dart rename to lib/features/caching/clients/account_cache_client.dart diff --git a/lib/features/caching/authentication_info_cache_client.dart b/lib/features/caching/clients/authentication_info_cache_client.dart similarity index 100% rename from lib/features/caching/authentication_info_cache_client.dart rename to lib/features/caching/clients/authentication_info_cache_client.dart diff --git a/lib/features/caching/cache_version_client.dart b/lib/features/caching/clients/cache_version_client.dart similarity index 100% rename from lib/features/caching/cache_version_client.dart rename to lib/features/caching/clients/cache_version_client.dart diff --git a/lib/features/caching/email_cache_client.dart b/lib/features/caching/clients/email_cache_client.dart similarity index 100% rename from lib/features/caching/email_cache_client.dart rename to lib/features/caching/clients/email_cache_client.dart diff --git a/lib/features/caching/encryption_key_cache_client.dart b/lib/features/caching/clients/encryption_key_cache_client.dart similarity index 100% rename from lib/features/caching/encryption_key_cache_client.dart rename to lib/features/caching/clients/encryption_key_cache_client.dart diff --git a/lib/features/caching/fcm_cache_client.dart b/lib/features/caching/clients/fcm_cache_client.dart similarity index 100% rename from lib/features/caching/fcm_cache_client.dart rename to lib/features/caching/clients/fcm_cache_client.dart diff --git a/lib/features/caching/hive_cache_version_client.dart b/lib/features/caching/clients/hive_cache_version_client.dart similarity index 91% rename from lib/features/caching/hive_cache_version_client.dart rename to lib/features/caching/clients/hive_cache_version_client.dart index 6ae63c667..1dae434f8 100644 --- a/lib/features/caching/hive_cache_version_client.dart +++ b/lib/features/caching/clients/hive_cache_version_client.dart @@ -1,5 +1,5 @@ import 'package:shared_preferences/shared_preferences.dart'; -import 'package:tmail_ui_user/features/caching/cache_version_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/cache_version_client.dart'; import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart'; class HiveCacheVersionClient extends CacheVersionClient { diff --git a/lib/features/caching/mailbox_cache_client.dart b/lib/features/caching/clients/mailbox_cache_client.dart similarity index 100% rename from lib/features/caching/mailbox_cache_client.dart rename to lib/features/caching/clients/mailbox_cache_client.dart diff --git a/lib/features/caching/recent_login_url_cache_client.dart b/lib/features/caching/clients/recent_login_url_cache_client.dart similarity index 100% rename from lib/features/caching/recent_login_url_cache_client.dart rename to lib/features/caching/clients/recent_login_url_cache_client.dart diff --git a/lib/features/caching/recent_login_username_cache_client.dart b/lib/features/caching/clients/recent_login_username_cache_client.dart similarity index 100% rename from lib/features/caching/recent_login_username_cache_client.dart rename to lib/features/caching/clients/recent_login_username_cache_client.dart diff --git a/lib/features/caching/recent_search_cache_client.dart b/lib/features/caching/clients/recent_search_cache_client.dart similarity index 100% rename from lib/features/caching/recent_search_cache_client.dart rename to lib/features/caching/clients/recent_search_cache_client.dart diff --git a/lib/features/caching/state_cache_client.dart b/lib/features/caching/clients/state_cache_client.dart similarity index 100% rename from lib/features/caching/state_cache_client.dart rename to lib/features/caching/clients/state_cache_client.dart diff --git a/lib/features/caching/subscription_cache_client.dart b/lib/features/caching/clients/subscription_cache_client.dart similarity index 100% rename from lib/features/caching/subscription_cache_client.dart rename to lib/features/caching/clients/subscription_cache_client.dart diff --git a/lib/features/caching/token_oidc_cache_client.dart b/lib/features/caching/clients/token_oidc_cache_client.dart similarity index 100% rename from lib/features/caching/token_oidc_cache_client.dart rename to lib/features/caching/clients/token_oidc_cache_client.dart diff --git a/lib/features/cleanup/data/local/recent_login_url_cache_manager.dart b/lib/features/cleanup/data/local/recent_login_url_cache_manager.dart index 8b32cecb2..2574e961a 100644 --- a/lib/features/cleanup/data/local/recent_login_url_cache_manager.dart +++ b/lib/features/cleanup/data/local/recent_login_url_cache_manager.dart @@ -1,5 +1,5 @@ -import 'package:tmail_ui_user/features/caching/recent_login_url_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_url_cache_client.dart'; import 'package:tmail_ui_user/features/cleanup/domain/model/recent_login_url_cleanup_rule.dart'; import 'package:tmail_ui_user/features/login/data/model/recent_login_url_cache.dart'; diff --git a/lib/features/cleanup/data/local/recent_login_username_cache_manager.dart b/lib/features/cleanup/data/local/recent_login_username_cache_manager.dart index 25c75e3f6..cb7093f8b 100644 --- a/lib/features/cleanup/data/local/recent_login_username_cache_manager.dart +++ b/lib/features/cleanup/data/local/recent_login_username_cache_manager.dart @@ -1,5 +1,5 @@ -import 'package:tmail_ui_user/features/caching/recent_login_username_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_username_cache_client.dart'; import 'package:tmail_ui_user/features/cleanup/domain/model/recent_login_username_cleanup_rule.dart'; import 'package:tmail_ui_user/features/login/data/model/recent_login_username_cache.dart'; diff --git a/lib/features/cleanup/data/local/recent_search_cache_manager.dart b/lib/features/cleanup/data/local/recent_search_cache_manager.dart index 2a9e38d6d..c72e1cca0 100644 --- a/lib/features/cleanup/data/local/recent_search_cache_manager.dart +++ b/lib/features/cleanup/data/local/recent_search_cache_manager.dart @@ -1,5 +1,5 @@ -import 'package:tmail_ui_user/features/caching/recent_search_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_search_cache_client.dart'; import 'package:tmail_ui_user/features/cleanup/domain/model/recent_search_cleanup_rule.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/recent_search_cache.dart'; diff --git a/lib/features/composer/presentation/composer_bindings.dart b/lib/features/composer/presentation/composer_bindings.dart index 00cf487b3..3efe0c891 100644 --- a/lib/features/composer/presentation/composer_bindings.dart +++ b/lib/features/composer/presentation/composer_bindings.dart @@ -2,7 +2,7 @@ import 'package:core/core.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/composer/data/datasource/composer_datasource.dart'; import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart'; import 'package:tmail_ui_user/features/composer/data/datasource_impl/composer_datasource_impl.dart'; diff --git a/lib/features/destination_picker/presentation/destination_picker_bindings.dart b/lib/features/destination_picker/presentation/destination_picker_bindings.dart index f31cdf196..ac769a771 100644 --- a/lib/features/destination_picker/presentation/destination_picker_bindings.dart +++ b/lib/features/destination_picker/presentation/destination_picker_bindings.dart @@ -1,7 +1,7 @@ import 'package:core/core.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/destination_picker/presentation/destination_picker_controller.dart'; import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart'; import 'package:tmail_ui_user/features/email/data/datasource_impl/email_datasource_impl.dart'; diff --git a/lib/features/email/presentation/email_bindings.dart b/lib/features/email/presentation/email_bindings.dart index a44c67e64..81d03912e 100644 --- a/lib/features/email/presentation/email_bindings.dart +++ b/lib/features/email/presentation/email_bindings.dart @@ -1,7 +1,7 @@ import 'package:core/core.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart'; import 'package:tmail_ui_user/features/email/data/datasource/html_datasource.dart'; import 'package:tmail_ui_user/features/email/data/datasource_impl/email_datasource_impl.dart'; diff --git a/lib/features/login/data/datasource_impl/login_url_datasource_impl.dart b/lib/features/login/data/datasource_impl/login_url_datasource_impl.dart index f6282c770..565ab0272 100644 --- a/lib/features/login/data/datasource_impl/login_url_datasource_impl.dart +++ b/lib/features/login/data/datasource_impl/login_url_datasource_impl.dart @@ -1,4 +1,4 @@ -import 'package:tmail_ui_user/features/caching/recent_login_url_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_url_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/datasource/login_url_datasource.dart'; import 'package:tmail_ui_user/features/login/data/model/recent_login_url_cache.dart'; import 'package:tmail_ui_user/features/login/domain/extensions/list_recent_login_url_extension.dart'; diff --git a/lib/features/login/data/datasource_impl/login_username_datasource_impl.dart b/lib/features/login/data/datasource_impl/login_username_datasource_impl.dart index f4f6e1d8c..230486581 100644 --- a/lib/features/login/data/datasource_impl/login_username_datasource_impl.dart +++ b/lib/features/login/data/datasource_impl/login_username_datasource_impl.dart @@ -1,4 +1,4 @@ -import 'package:tmail_ui_user/features/caching/recent_login_username_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_username_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/datasource/login_username_datasource.dart'; import 'package:tmail_ui_user/features/login/data/model/recent_login_username_cache.dart'; import 'package:tmail_ui_user/features/login/domain/extensions/list_recent_login_username_extension.dart'; diff --git a/lib/features/login/data/local/account_cache_manager.dart b/lib/features/login/data/local/account_cache_manager.dart index cfb6e864e..a68830980 100644 --- a/lib/features/login/data/local/account_cache_manager.dart +++ b/lib/features/login/data/local/account_cache_manager.dart @@ -1,6 +1,6 @@ import 'package:core/utils/app_logger.dart'; import 'package:model/account/personal_account.dart'; -import 'package:tmail_ui_user/features/caching/account_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/account_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/extensions/account_cache_extensions.dart'; import 'package:tmail_ui_user/features/login/data/extensions/personal_account_extension.dart'; import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart'; diff --git a/lib/features/login/data/local/authentication_info_cache_manager.dart b/lib/features/login/data/local/authentication_info_cache_manager.dart index fb3c8495c..e200a361a 100644 --- a/lib/features/login/data/local/authentication_info_cache_manager.dart +++ b/lib/features/login/data/local/authentication_info_cache_manager.dart @@ -1,4 +1,4 @@ -import 'package:tmail_ui_user/features/caching/authentication_info_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/authentication_info_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/model/authentication_info_cache.dart'; class AuthenticationInfoCacheManager { diff --git a/lib/features/login/data/local/encryption_key_cache_manager.dart b/lib/features/login/data/local/encryption_key_cache_manager.dart index 2a89b6b19..bb3720fc7 100644 --- a/lib/features/login/data/local/encryption_key_cache_manager.dart +++ b/lib/features/login/data/local/encryption_key_cache_manager.dart @@ -1,4 +1,4 @@ -import 'package:tmail_ui_user/features/caching/encryption_key_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/encryption_key_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/model/encryption_key_cache.dart'; class EncryptionKeyCacheManager { diff --git a/lib/features/login/data/local/token_oidc_cache_manager.dart b/lib/features/login/data/local/token_oidc_cache_manager.dart index ebedb9c57..1dd6d2c8b 100644 --- a/lib/features/login/data/local/token_oidc_cache_manager.dart +++ b/lib/features/login/data/local/token_oidc_cache_manager.dart @@ -1,6 +1,6 @@ import 'package:core/utils/app_logger.dart'; import 'package:model/oidc/token_oidc.dart'; -import 'package:tmail_ui_user/features/caching/token_oidc_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/token_oidc_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/extensions/token_oidc_cache_extension.dart'; import 'package:tmail_ui_user/features/login/data/extensions/token_oidc_extension.dart'; import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart'; diff --git a/lib/features/login/presentation/login_bindings.dart b/lib/features/login/presentation/login_bindings.dart index 982aef4f6..2660d1abc 100644 --- a/lib/features/login/presentation/login_bindings.dart +++ b/lib/features/login/presentation/login_bindings.dart @@ -1,8 +1,8 @@ import 'package:core/core.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/recent_login_url_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/recent_login_username_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_url_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_username_cache_client.dart'; import 'package:tmail_ui_user/features/login/data/datasource/account_datasource.dart'; import 'package:tmail_ui_user/features/login/data/datasource/authentication_datasource.dart'; import 'package:tmail_ui_user/features/login/data/datasource/authentication_oidc_datasource.dart'; @@ -17,7 +17,6 @@ import 'package:tmail_ui_user/features/login/data/local/account_cache_manager.da import 'package:tmail_ui_user/features/login/data/local/oidc_configuration_cache_manager.dart'; import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager.dart'; import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart'; -import 'package:tmail_ui_user/features/login/data/network/config/authorization_interceptors.dart'; import 'package:tmail_ui_user/features/login/data/network/oidc_http_client.dart'; import 'package:tmail_ui_user/features/login/data/repository/account_repository_impl.dart'; import 'package:tmail_ui_user/features/login/data/repository/authentication_oidc_repository_impl.dart'; @@ -49,7 +48,6 @@ import 'package:tmail_ui_user/features/login/domain/usecases/save_login_username import 'package:tmail_ui_user/features/login/domain/usecases/update_authentication_account_interactor.dart'; import 'package:tmail_ui_user/features/login/presentation/login_controller.dart'; import 'package:tmail_ui_user/features/manage_account/domain/usecases/log_out_oidc_interactor.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'; diff --git a/lib/features/mailbox/data/datasource_impl/state_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/state_datasource_impl.dart index 2f67c789b..f5fa549bf 100644 --- a/lib/features/mailbox/data/datasource_impl/state_datasource_impl.dart +++ b/lib/features/mailbox/data/datasource_impl/state_datasource_impl.dart @@ -3,7 +3,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; import 'package:jmap_dart_client/jmap/core/user_name.dart'; import 'package:model/extensions/account_id_extensions.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/caching/utils/cache_utils.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/model/state_cache.dart'; diff --git a/lib/features/mailbox/data/local/mailbox_cache_manager.dart b/lib/features/mailbox/data/local/mailbox_cache_manager.dart index 3c2f99632..f41c87e5a 100644 --- a/lib/features/mailbox/data/local/mailbox_cache_manager.dart +++ b/lib/features/mailbox/data/local/mailbox_cache_manager.dart @@ -4,7 +4,7 @@ import 'package:jmap_dart_client/jmap/core/user_name.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:model/extensions/account_id_extensions.dart'; import 'package:model/mailbox/presentation_mailbox.dart'; -import 'package:tmail_ui_user/features/caching/mailbox_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/mailbox_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/list_mailbox_cache_extension.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/list_mailbox_extension.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/list_mailbox_id_extension.dart'; diff --git a/lib/features/mailbox/presentation/mailbox_bindings.dart b/lib/features/mailbox/presentation/mailbox_bindings.dart index ca35e8590..60f17d70b 100644 --- a/lib/features/mailbox/presentation/mailbox_bindings.dart +++ b/lib/features/mailbox/presentation/mailbox_bindings.dart @@ -1,7 +1,7 @@ import 'package:core/core.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart'; import 'package:tmail_ui_user/features/email/data/datasource_impl/email_datasource_impl.dart'; import 'package:tmail_ui_user/features/email/data/network/email_api.dart'; diff --git a/lib/features/mailbox_dashboard/data/datasource_impl/search_datasource_impl.dart b/lib/features/mailbox_dashboard/data/datasource_impl/search_datasource_impl.dart index 4530b9805..1c7a6a9c5 100644 --- a/lib/features/mailbox_dashboard/data/datasource_impl/search_datasource_impl.dart +++ b/lib/features/mailbox_dashboard/data/datasource_impl/search_datasource_impl.dart @@ -1,5 +1,5 @@ -import 'package:tmail_ui_user/features/caching/recent_search_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_search_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/search_datasource.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/recent_search_cache.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/domain/extensions/list_recent_search_extension.dart'; 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 92ae8017a..722477755 100644 --- a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart +++ b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart @@ -3,8 +3,8 @@ import 'package:core/data/network/dio_client.dart'; import 'package:core/utils/config/app_config_loader.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/recent_search_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_search_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/composer/data/repository/contact_repository_impl.dart'; import 'package:tmail_ui_user/features/composer/domain/repository/contact_repository.dart'; import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart'; diff --git a/lib/features/manage_account/presentation/mailbox_visibility/bindings/mailbox_visibility_interactor_bindings.dart b/lib/features/manage_account/presentation/mailbox_visibility/bindings/mailbox_visibility_interactor_bindings.dart index 31b12c149..407d91591 100644 --- a/lib/features/manage_account/presentation/mailbox_visibility/bindings/mailbox_visibility_interactor_bindings.dart +++ b/lib/features/manage_account/presentation/mailbox_visibility/bindings/mailbox_visibility_interactor_bindings.dart @@ -3,7 +3,7 @@ import 'package:tmail_ui_user/features/base/interactors_bindings.dart'; import 'package:tmail_ui_user/features/mailbox/domain/usecases/subscribe_multiple_mailbox_interactor.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:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart'; diff --git a/lib/features/push_notification/data/local/fcm_cache_manager.dart b/lib/features/push_notification/data/local/fcm_cache_manager.dart index bbe255d2b..b916cb7eb 100644 --- a/lib/features/push_notification/data/local/fcm_cache_manager.dart +++ b/lib/features/push_notification/data/local/fcm_cache_manager.dart @@ -2,8 +2,8 @@ import 'package:fcm/model/type_name.dart'; import 'package:jmap_dart_client/jmap/account_id.dart'; import 'package:jmap_dart_client/jmap/core/user_name.dart'; import 'package:model/extensions/account_id_extensions.dart'; -import 'package:tmail_ui_user/features/caching/fcm_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/subscription_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/fcm_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/subscription_cache_client.dart'; import 'package:tmail_ui_user/features/caching/utils/cache_utils.dart'; import 'package:tmail_ui_user/features/push_notification/data/model/fcm_subscription.dart'; import 'package:tmail_ui_user/features/push_notification/domain/exceptions/fcm_exception.dart'; diff --git a/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart b/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart index 97ebe9624..3b9f95a08 100644 --- a/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart +++ b/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart @@ -2,7 +2,7 @@ import 'package:core/data/model/source_type/data_source_type.dart'; import 'package:core/data/network/dio_client.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/interactors_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart'; import 'package:tmail_ui_user/features/email/data/datasource/html_datasource.dart'; import 'package:tmail_ui_user/features/email/data/datasource_impl/email_datasource_impl.dart'; 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 5dee9046a..ce17e4b42 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 @@ -1,7 +1,7 @@ import 'package:core/data/model/source_type/data_source_type.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart'; diff --git a/lib/features/search/mailbox/presentation/search_mailbox_bindings.dart b/lib/features/search/mailbox/presentation/search_mailbox_bindings.dart index a3a89a452..fe45e026d 100644 --- a/lib/features/search/mailbox/presentation/search_mailbox_bindings.dart +++ b/lib/features/search/mailbox/presentation/search_mailbox_bindings.dart @@ -2,7 +2,7 @@ import 'package:core/data/model/source_type/data_source_type.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart'; diff --git a/lib/features/thread/data/local/email_cache_manager.dart b/lib/features/thread/data/local/email_cache_manager.dart index 712f59209..9b789fd6b 100644 --- a/lib/features/thread/data/local/email_cache_manager.dart +++ b/lib/features/thread/data/local/email_cache_manager.dart @@ -4,7 +4,7 @@ import 'package:jmap_dart_client/jmap/core/user_name.dart'; import 'package:model/model.dart'; import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; -import 'package:tmail_ui_user/features/caching/email_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/email_cache_client.dart'; import 'package:tmail_ui_user/features/cleanup/domain/model/email_cleanup_rule.dart'; import 'package:tmail_ui_user/features/thread/data/extensions/email_cache_extension.dart'; import 'package:tmail_ui_user/features/thread/data/extensions/email_extension.dart'; diff --git a/lib/features/thread/presentation/thread_bindings.dart b/lib/features/thread/presentation/thread_bindings.dart index 4ff0b474f..da31dff51 100644 --- a/lib/features/thread/presentation/thread_bindings.dart +++ b/lib/features/thread/presentation/thread_bindings.dart @@ -1,7 +1,7 @@ import 'package:core/data/model/source_type/data_source_type.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/base_bindings.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource_impl/state_datasource_impl.dart'; import 'package:tmail_ui_user/features/thread/data/datasource/thread_datasource.dart'; diff --git a/lib/main/bindings/local/local_bindings.dart b/lib/main/bindings/local/local_bindings.dart index e69b6b983..81e487514 100644 --- a/lib/main/bindings/local/local_bindings.dart +++ b/lib/main/bindings/local/local_bindings.dart @@ -1,20 +1,20 @@ import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:tmail_ui_user/features/caching/account_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/authentication_info_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/account_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/authentication_info_cache_client.dart'; import 'package:tmail_ui_user/features/caching/caching_manager.dart'; -import 'package:tmail_ui_user/features/caching/email_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/encryption_key_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/fcm_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/hive_cache_version_client.dart'; -import 'package:tmail_ui_user/features/caching/mailbox_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/recent_login_url_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/recent_login_username_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/recent_search_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/subscription_cache_client.dart'; -import 'package:tmail_ui_user/features/caching/token_oidc_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/email_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/encryption_key_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/fcm_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/hive_cache_version_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/mailbox_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_url_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_login_username_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/recent_search_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/subscription_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/token_oidc_cache_client.dart'; import 'package:tmail_ui_user/features/cleanup/data/local/recent_login_url_cache_manager.dart'; import 'package:tmail_ui_user/features/cleanup/data/local/recent_login_username_cache_manager.dart'; import 'package:tmail_ui_user/features/cleanup/data/local/recent_search_cache_manager.dart'; diff --git a/test/features/caching/email_cache_client_test.dart b/test/features/caching/email_cache_client_test.dart index f0bd0e464..e7350cd78 100644 --- a/test/features/caching/email_cache_client_test.dart +++ b/test/features/caching/email_cache_client_test.dart @@ -3,8 +3,8 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; +import 'package:tmail_ui_user/features/caching/clients/email_cache_client.dart'; import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart'; -import 'package:tmail_ui_user/features/caching/email_cache_client.dart'; import 'package:tmail_ui_user/features/thread/data/extensions/email_extension.dart'; import '../../fixtures/email_fixtures.dart'; diff --git a/test/features/caching/mailbox_cache_client_test.dart b/test/features/caching/mailbox_cache_client_test.dart index 671d98552..11ce1fd01 100644 --- a/test/features/caching/mailbox_cache_client_test.dart +++ b/test/features/caching/mailbox_cache_client_test.dart @@ -3,8 +3,8 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; +import 'package:tmail_ui_user/features/caching/clients/mailbox_cache_client.dart'; import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart'; -import 'package:tmail_ui_user/features/caching/mailbox_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/mailbox_extension.dart'; import '../../fixtures/mailbox_fixtures.dart'; diff --git a/test/features/offline_mode/woker_queue_test.dart b/test/features/offline_mode/woker_queue_test.dart index a56b6077a..8fa07ef3e 100644 --- a/test/features/offline_mode/woker_queue_test.dart +++ b/test/features/offline_mode/woker_queue_test.dart @@ -6,7 +6,7 @@ import 'package:core/utils/app_logger.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart'; -import 'package:tmail_ui_user/features/caching/state_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/state_extension.dart'; import 'package:tmail_ui_user/features/mailbox/data/model/state_type.dart'; import 'package:tmail_ui_user/features/offline_mode/worker/hive_task.dart';