Skip to content

Fix QoS mismatch hang warning in Contacts service #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattt merged 1 commit into from
Jan 29, 2026
Merged

Fix QoS mismatch hang warning in Contacts service #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions App/Services/Contacts.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ final class ContactsService: Service {

static let shared = ContactsService()

private func runContactStore<T>(_ operation: @escaping () throws -> T) async throws -> T {
try await Task(priority: .utility) {
try operation()
}.value
}

var isActivated: Bool {
get async {
let status = CNContactStore.authorizationStatus(for: .contacts)
Expand Down Expand Up @@ -138,7 +144,9 @@ final class ContactsService: Service {
openWorldHint: false
)
) { _ in
let contact = try self.contactStore.unifiedMeContactWithKeys(toFetch: contactKeys)
let contact = try await self.runContactStore {
try self.contactStore.unifiedMeContactWithKeys(toFetch: contactKeys)
}
return Person(contact)
}

Expand Down Expand Up @@ -206,10 +214,12 @@ final class ContactsService: Service {
? predicates[0]
: NSCompoundPredicate(andPredicateWithSubpredicates: predicates)

let contacts = try self.contactStore.unifiedContacts(
matching: finalPredicate,
keysToFetch: contactKeys
)
let contacts = try await self.runContactStore {
try self.contactStore.unifiedContacts(
matching: finalPredicate,
keysToFetch: contactKeys
)
}

return contacts.compactMap { Person($0) }
}
Expand Down Expand Up @@ -247,7 +257,9 @@ final class ContactsService: Service {
// Fetch the mutable copy of the contact
let predicate = CNContact.predicateForContacts(withIdentifiers: [identifier])
let contact =
try self.contactStore.unifiedContacts(matching: predicate, keysToFetch: contactKeys)
try await self.runContactStore {
try self.contactStore.unifiedContacts(matching: predicate, keysToFetch: contactKeys)
}
.first?
.mutableCopy() as? CNMutableContact

Expand All @@ -270,7 +282,9 @@ final class ContactsService: Service {
saveRequest.update(updatedContact)

// Save the changes
try self.contactStore.execute(saveRequest)
try await self.runContactStore {
try self.contactStore.execute(saveRequest)
}

return Person(updatedContact)
}
Expand Down Expand Up @@ -307,7 +321,9 @@ final class ContactsService: Service {
saveRequest.add(newContact, toContainerWithIdentifier: nil)

// Execute the save request
try self.contactStore.execute(saveRequest)
try await self.runContactStore {
try self.contactStore.execute(saveRequest)
}

return Person(newContact)
}
Expand Down