From 62d48dc0843651df9050481fbc22df60a1266b55 Mon Sep 17 00:00:00 2001
From: AlexisDanlos <91090088+AlexisDanlos@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:13:32 +0200
Subject: [PATCH] refactor: improve contact fetching and initialization logic
 for better performance and clarity

---
 .../features/contacts/contact_state.dart      | 50 ++++++++++++++++---
 .../presentation/features/home/home_page.dart | 29 +++++++++--
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/dialer/lib/presentation/features/contacts/contact_state.dart b/dialer/lib/presentation/features/contacts/contact_state.dart
index 5d6ca9b..f555d66 100644
--- a/dialer/lib/presentation/features/contacts/contact_state.dart
+++ b/dialer/lib/presentation/features/contacts/contact_state.dart
@@ -35,10 +35,20 @@ class _ContactStateState extends State<ContactState> {
   @override
   void initState() {
     super.initState();
-    fetchContacts(); // Fetch all contacts by default
+    _initializeContacts(); // Rename to make it clear this is initialization
     FlutterContacts.addListener(_onContactChange);
   }
 
+  // Private method to initialize contacts without setState during build
+  Future<void> _initializeContacts() async {
+    try {
+      List<Contact> contacts = await _contactService.fetchContacts();
+      _processContactsInitial(contacts);
+    } catch (e) {
+      debugPrint('Error fetching contacts: $e');
+    }
+  }
+
   void _onContactChange() async {
     await fetchContacts();
   }
@@ -49,14 +59,16 @@ class _ContactStateState extends State<ContactState> {
     super.dispose();
   }
 
-  // Fetch all contacts
+  // Fetch all contacts - public method that can be called after build
   Future<void> fetchContacts() async {
     if (!mounted) return;
     
     setState(() => _loading = true);
     try {
       List<Contact> contacts = await _contactService.fetchContacts();
-      _processContacts(contacts);
+      if (mounted) {
+        _processContacts(contacts);
+      }
     } catch (e) {
       debugPrint('Error fetching contacts: $e');
     } finally {
@@ -85,6 +97,34 @@ class _ContactStateState extends State<ContactState> {
     }
   }
 
+  // Process contacts without setState for initial loading
+  void _processContactsInitial(List<Contact> contacts) {
+    if (!mounted) return;
+    
+    _selfContact = contacts.firstWhere(
+      (contact) => contact.displayName.toLowerCase() == "user",
+      orElse: () => Contact(),
+    );
+
+    if (_selfContact!.phones.isEmpty) {
+      _selfContact = null;
+    }
+
+    contacts = contacts.where((contact) => contact.phones.isNotEmpty).toList();
+    contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
+
+    _allContacts = contacts;
+    _favoriteContacts = contacts.where((contact) => contact.isStarred).toList();
+    _loading = false;
+    
+    // Force a rebuild after initialization is complete
+    if (mounted) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        setState(() {});
+      });
+    }
+  }
+
   void _processContacts(List<Contact> contacts) {
     if (!mounted) return;
     
@@ -94,7 +134,6 @@ class _ContactStateState extends State<ContactState> {
     );
 
     if (_selfContact!.phones.isEmpty) {
-      debugPrint("Self contact has no phone numbers");
       _selfContact = null;
     }
 
@@ -103,8 +142,7 @@ class _ContactStateState extends State<ContactState> {
 
     setState(() {
       _allContacts = contacts;
-      _favoriteContacts =
-          contacts.where((contact) => contact.isStarred).toList();
+      _favoriteContacts = contacts.where((contact) => contact.isStarred).toList();
     });
   }
 
diff --git a/dialer/lib/presentation/features/home/home_page.dart b/dialer/lib/presentation/features/home/home_page.dart
index b033971..16f9487 100644
--- a/dialer/lib/presentation/features/home/home_page.dart
+++ b/dialer/lib/presentation/features/home/home_page.dart
@@ -24,22 +24,41 @@ class _MyHomePageState extends State<MyHomePage>
   List<Contact> _contactSuggestions = [];
   final ObfuscateService _obfuscateService = ObfuscateService();
   final TextEditingController _searchController = TextEditingController();
+  bool _isInitialized = false;
 
   @override
   void initState() {
     super.initState();
-    // Set the TabController length to 4
     _tabController = TabController(length: 4, vsync: this, initialIndex: 1);
     _tabController.addListener(_handleTabIndex);
-    _fetchContacts();
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_isInitialized) {
+      // Use a post-frame callback to avoid setState during build
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _fetchContacts();
+      });
+      _isInitialized = true;
+    }
   }
 
   void _fetchContacts() async {
     final contactState = ContactState.of(context);
+    // Wait for initial load to finish if it hasn't already
+    if (contactState.loading) {
+      await Future.delayed(const Duration(milliseconds: 100));
+    }
+    // Then explicitly fetch contacts (which will call setState safely)
     await contactState.fetchContacts();
-    setState(() {
-      _allContacts = contactState.contacts;
-    });
+    if (mounted) {
+      setState(() {
+        _allContacts = contactState.contacts;
+        _contactSuggestions = _allContacts;
+      });
+    }
   }
 
   void _clearSearch() {