From e74df7630157cd05c0b22da9694a06db00355c30 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Wed, 29 Jan 2025 15:23:10 +0100 Subject: [PATCH] Reduced conversation list refresh to once, triggered after fetching all contacts --- Linphone/Contacts/ContactsManager.swift | 5 ++--- Linphone/UI/Main/ContentView.swift | 3 --- .../Conversations/Fragments/ConversationsListFragment.swift | 5 ----- .../Conversations/ViewModel/ConversationsListViewModel.swift | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Linphone/Contacts/ContactsManager.swift b/Linphone/Contacts/ContactsManager.swift index df963ff77..862b3dc48 100644 --- a/Linphone/Contacts/ContactsManager.swift +++ b/Linphone/Contacts/ContactsManager.swift @@ -89,7 +89,6 @@ final class ContactsManager: ObservableObject { } let store = CNContactStore() - store.requestAccess(for: .contacts) { (granted, error) in if let error = error { print("\(#function) - failed to request access", error) @@ -162,10 +161,10 @@ final class ContactsManager: ObservableObject { DispatchQueue.main.async { self.avatarListModel += addedAvatarListModel } - - MagicSearchSingleton.shared.searchForContacts(sourceFlags: MagicSearch.Source.Friends.rawValue | MagicSearch.Source.LdapServers.rawValue) }) self.friendList?.addDelegate(delegate: self.friendListDelegate!) + + MagicSearchSingleton.shared.searchForContacts(sourceFlags: MagicSearch.Source.Friends.rawValue | MagicSearch.Source.LdapServers.rawValue) } } } diff --git a/Linphone/UI/Main/ContentView.swift b/Linphone/UI/Main/ContentView.swift index f954aa4ec..9faedf396 100644 --- a/Linphone/UI/Main/ContentView.swift +++ b/Linphone/UI/Main/ContentView.swift @@ -1340,9 +1340,6 @@ struct ContentView: View { .zIndex(6) } } - .onAppear { - MagicSearchSingleton.shared.searchForContacts(sourceFlags: MagicSearch.Source.Friends.rawValue | MagicSearch.Source.LdapServers.rawValue) - } .onChange(of: navigationManager.selectedCallId) { newCallId in if newCallId != nil { self.index = 2 diff --git a/Linphone/UI/Main/Conversations/Fragments/ConversationsListFragment.swift b/Linphone/UI/Main/Conversations/Fragments/ConversationsListFragment.swift index da989aa4f..ba4c4c72b 100644 --- a/Linphone/UI/Main/Conversations/Fragments/ConversationsListFragment.swift +++ b/Linphone/UI/Main/Conversations/Fragments/ConversationsListFragment.swift @@ -69,11 +69,6 @@ struct ConversationsListFragment: View { .padding(.all) ) } - .onChange(of: scenePhase) { newPhase in - if newPhase == .active { - conversationsListViewModel.computeChatRoomsList(filter: "") - } - } .navigationTitle("") .navigationBarHidden(true) } diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift index 875080ca7..49117f1b9 100644 --- a/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift +++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift @@ -37,7 +37,6 @@ class ConversationsListViewModel: ObservableObject { var selectedConversation: ConversationModel? init() { - computeChatRoomsList(filter: "") addConversationDelegate() }