fixup! TW-888 Synchronize Contact refactor interactors

linagora · Nov 15, 2023 · f884522 · f884522
1 parent e2f81ec
commit f884522
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 12 deletions.
diff --git a/lib/domain/contact_manager/contacts_manager.dart b/lib/domain/contact_manager/contacts_manager.dart
@@ -7,6 +7,7 @@ import 'package:fluffychat/domain/model/contact/contact.dart';
 import 'package:fluffychat/domain/model/contact/contacts_manager_agruments.dart';
 import 'package:fluffychat/domain/usecase/get_all_contacts_interactor.dart';
 import 'package:fluffychat/domain/usecase/lookup_mxid_interactor.dart';
+import 'package:fluffychat/domain/usecase/phonebook_contact_interactor.dart';
 import 'package:fluffychat/utils/permission_service.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter_contacts/flutter_contacts.dart' hide Contact;
@@ -25,7 +26,7 @@ enum DisplayWaringContactsBannerState {
 }
 
 class ContactsManager {
-  static const int _lookupChunkSize = 10;
+  static const int _lookupChunkSize = 50;
 
   SyncContactsState _syncContactsState = SyncContactsState.initial;
 
@@ -40,6 +41,8 @@ class ContactsManager {
 
   final _lookupMxidInteractor = getIt.get<LookupMxidInteractor>();
 
+  final _phonebookContactInteractor = getIt.get<PhonebookContactInteractor>();
+
   final PermissionHandlerService permissionHandlerService =
       PermissionHandlerService();
 
@@ -112,8 +115,19 @@ class ContactsManager {
   }
 
   void _fetchPhonebookContacts() async {
+    _phonebookContactInteractor.execute().listen((contacts) {
+      _phonebookContacts = contacts.toSet();
+      _handleContactsHasDataChange();
+      _lookupContacts(contacts);
+    });
+  }
+
+  void _lookupContacts(List<Contact> contacts) {
     _lookupMxidInteractor
-        .execute(lookupChunkSize: _lookupChunkSize)
+        .execute(
+      phonebookContacts: contacts,
+      lookupChunkSize: _lookupChunkSize,
+    )
         .listen((contacts) {
       _phonebookContacts = contacts.toSet();
       _handleContactsHasDataChange();

diff --git a/lib/domain/usecase/lookup_mxid_interactor.dart b/lib/domain/usecase/lookup_mxid_interactor.dart
@@ -4,22 +4,19 @@ import 'package:fluffychat/domain/model/contact/contact.dart';
 import 'package:fluffychat/domain/model/contact/contact_status.dart';
 import 'package:fluffychat/domain/model/contact/lookup_list_mxid_request.dart';
 import 'package:fluffychat/domain/repository/lookup_repository.dart';
-import 'package:fluffychat/domain/repository/phonebook_contact_repository.dart';
 import 'package:matrix/matrix.dart';
 
 class LookupMxidInteractor {
   final LookupRepository _lookupRepository = getIt.get<LookupRepository>();
 
-  final PhonebookContactRepository _phonebookContactRepository =
-      getIt.get<PhonebookContactRepository>();
-
-  Stream<List<Contact>> execute({int lookupChunkSize = 50}) async* {
+  Stream<List<Contact>> execute({
+    required List<Contact> phonebookContacts,
+    int lookupChunkSize = 50,
+  }) async* {
     try {
-      var contacts = await _phonebookContactRepository.fetchContacts();
-      yield contacts;
       final hashDetails = await _lookupRepository.getHashDetails();
       final thirdPartyIdToHashMap = {
-        for (final contact in contacts)
+        for (final contact in phonebookContacts)
           contact.thirdPartyId:
               contact.calLookupAddress(hashDetails: hashDetails),
       };
@@ -33,7 +30,7 @@ class LookupMxidInteractor {
             pepper: hashDetails.lookupPepper,
           ),
         );
-        contacts = contacts.map((contact) {
+        phonebookContacts = phonebookContacts.map((contact) {
           if (contact.thirdPartyId != null) {
             final hash = thirdPartyIdToHashMap[contact.thirdPartyId];
             if (hash != null && response.mappings?[hash] != null) {
@@ -51,7 +48,7 @@ class LookupMxidInteractor {
           }
           return contact;
         }).toList();
-        yield contacts;
+        yield phonebookContacts;
       }
     } catch (e) {
       Logs().e('LookupMxidInteractor::error', e);

diff --git a/lib/domain/usecase/phonebook_contact_interactor.dart b/lib/domain/usecase/phonebook_contact_interactor.dart
@@ -0,0 +1,19 @@
+import 'package:fluffychat/di/global/get_it_initializer.dart';
+import 'package:fluffychat/domain/model/contact/contact.dart';
+import 'package:fluffychat/domain/repository/phonebook_contact_repository.dart';
+import 'package:matrix/matrix.dart';
+
+class PhonebookContactInteractor {
+  final PhonebookContactRepository _phonebookContactRepository =
+      getIt.get<PhonebookContactRepository>();
+
+  Stream<List<Contact>> execute() async* {
+    try {
+      final contacts = await _phonebookContactRepository.fetchContacts();
+      yield contacts;
+    } catch (e) {
+      Logs().e('PhonebookContactInteractor::error', e);
+      yield [];
+    }
+  }
+}