From 5f2c42004e50e2829d4a921a0eeee231de479259 Mon Sep 17 00:00:00 2001 From: Dat PHAM HOANG Date: Wed, 14 Sep 2022 11:22:47 +0700 Subject: [PATCH] TF-939 Update Tmail contact capabilityIdentifier --- .../autocomplete/autocomplete_tmail_contact_method.dart | 2 +- contact/lib/contact/model/capability_contact.dart | 2 +- .../composer/presentation/extensions/session_extension.dart | 4 ++-- .../presentation/emails_forward_creator_controller.dart | 4 ++-- .../presentation/bindings/autocomplete_bindings.dart | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contact/lib/contact/autocomplete/autocomplete_tmail_contact_method.dart b/contact/lib/contact/autocomplete/autocomplete_tmail_contact_method.dart index 45b427fd3..3c1062cce 100644 --- a/contact/lib/contact/autocomplete/autocomplete_tmail_contact_method.dart +++ b/contact/lib/contact/autocomplete/autocomplete_tmail_contact_method.dart @@ -20,7 +20,7 @@ class AutoCompleteTMailContactMethod extends AutoCompleteMethod { @override Set get requiredCapabilities => { CapabilityIdentifier.jmapCore, - capabilityContact + tmailContactCapabilityIdentifier }; factory AutoCompleteTMailContactMethod.fromJson(Map json) { diff --git a/contact/lib/contact/model/capability_contact.dart b/contact/lib/contact/model/capability_contact.dart index 36363c28f..cc4c7091f 100644 --- a/contact/lib/contact/model/capability_contact.dart +++ b/contact/lib/contact/model/capability_contact.dart @@ -1,4 +1,4 @@ import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; -final capabilityContact = CapabilityIdentifier(Uri.parse('com:linagora:params:jmap:contact:autocomplete')); \ No newline at end of file +final tmailContactCapabilityIdentifier = CapabilityIdentifier(Uri.parse('com:linagora:params:jmap:contact:autocomplete')); \ No newline at end of file diff --git a/lib/features/composer/presentation/extensions/session_extension.dart b/lib/features/composer/presentation/extensions/session_extension.dart index 23d473bcb..f052f1050 100644 --- a/lib/features/composer/presentation/extensions/session_extension.dart +++ b/lib/features/composer/presentation/extensions/session_extension.dart @@ -4,6 +4,6 @@ import 'package:jmap_dart_client/jmap/core/session/session.dart'; extension SessionExtension on Session { - bool get hasSupportAutoComplete => - capabilities.containsKey(contact.capabilityContact); + bool get hasSupportTmailAutoComplete => + capabilities.containsKey(contact.tmailContactCapabilityIdentifier); } \ No newline at end of file diff --git a/lib/features/emails_forward_creator/presentation/emails_forward_creator_controller.dart b/lib/features/emails_forward_creator/presentation/emails_forward_creator_controller.dart index b47ce7eaa..a696b6f71 100644 --- a/lib/features/emails_forward_creator/presentation/emails_forward_creator_controller.dart +++ b/lib/features/emails_forward_creator/presentation/emails_forward_creator_controller.dart @@ -12,10 +12,10 @@ import 'package:tmail_ui_user/features/composer/domain/model/contact_suggestion_ import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart'; import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart'; import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_with_device_contact_interactor.dart'; +import 'package:tmail_ui_user/features/composer/presentation/extensions/session_extension.dart'; import 'package:tmail_ui_user/features/emails_forward_creator/presentation/model/mails_forward_creator_arguments.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/forward/forward_controller.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart'; -import 'package:tmail_ui_user/features/composer/presentation/extensions/session_extension.dart'; class EmailsForwardCreatorController extends BaseController { @@ -65,7 +65,7 @@ class EmailsForwardCreatorController extends BaseController { {required String word}) async { log('EmailsForwardCreatorController::getAutoCompleteSuggestion(): $word | $_contactSuggestionSource'); - if(_session?.hasSupportAutoComplete != true) return []; + if(_session?.hasSupportTmailAutoComplete != true) return []; _getAutoCompleteWithDeviceContactInteractor = Get.find(); _getAutoCompleteInteractor = Get.find(); diff --git a/lib/features/mailbox_dashboard/presentation/bindings/autocomplete_bindings.dart b/lib/features/mailbox_dashboard/presentation/bindings/autocomplete_bindings.dart index e21c61e8c..e6795f403 100644 --- a/lib/features/mailbox_dashboard/presentation/bindings/autocomplete_bindings.dart +++ b/lib/features/mailbox_dashboard/presentation/bindings/autocomplete_bindings.dart @@ -34,7 +34,7 @@ class AutoCompleteBindings extends BaseBindings { void bindingsDataSourceImpl() { _dataSources.clear(); Get.lazyPut(() => ContactDataSourceImpl()); - if (_mailboxDashBoardController.sessionCurrent?.hasSupportAutoComplete == true) { + if (_mailboxDashBoardController.sessionCurrent?.hasSupportTmailAutoComplete == true) { Get.lazyPut(() => TMailContactDataSourceImpl(Get.find())); _dataSources.add(Get.find()); }