Skip to content

fix(file-provider): Remove unused XPC utils methods #10895

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
i2h3 merged 1 commit into from
Sep 23, 2026
Merged

fix(file-provider): Remove unused XPC utils methods #10895

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions src/gui/macOS/fileproviderxpc_mac_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
namespace OCC::Mac::FileProviderXPCUtils {

NSArray<NSFileProviderManager *> *getDomainManagers();
NSArray<NSURL *> *getDomainUrlsForManagers(NSArray<NSFileProviderManager *> *managers);
NSArray<NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *> *getFileProviderServices(NSArray<NSFileProviderManager *> *managers);
NSArray<NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *> *getFileProviderServicesAtUrls(NSArray<NSURL *> *urls);
NSArray<NSXPCConnection *> *connectToFileProviderServices(NSArray<NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *> *fpServices);
void configureFileProviderConnection(NSXPCConnection *connection);
NSObject *getRemoteServiceObject(NSXPCConnection *connection, Protocol *protocol);
Expand Down
74 changes: 0 additions & 74 deletions src/gui/macOS/fileproviderxpc_mac_utils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,80 +92,6 @@
return fpServices.copy;
}

NSArray<NSURL *> *getDomainUrlsForManagers(NSArray<NSFileProviderManager *> *managers)
{
dispatch_group_t group = dispatch_group_create();
__block NSMutableArray<NSURL *> *const urls = NSMutableArray.array;

for (NSFileProviderManager *const manager in managers) {

dispatch_group_enter(group);

[manager getUserVisibleURLForItemIdentifier:NSFileProviderRootContainerItemIdentifier
completionHandler:^(NSURL *const url, NSError *const error){
if (error != nil) {
qCWarning(lcFileProviderXPCUtils) << "Error getting user visible url" << error;
dispatch_group_leave(group);
return;
}

qCDebug(lcFileProviderXPCUtils) << "Got user visible url" << url;
if (url != nil) {
@synchronized (urls) {
[urls addObject:url];
}
}
dispatch_group_leave(group);
}];
}

dispatch_group_wait(group, DISPATCH_TIME_FOREVER);

if (urls.count == 0) {
qCWarning(lcFileProviderXPCUtils) << "No urls found";
}

return urls.copy;
}

NSArray<NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *> *getFileProviderServicesAtUrls(NSArray<NSURL *> *urls)
{
dispatch_group_t group = dispatch_group_create();
NSMutableArray<NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *> *const fpServices = NSMutableArray.array;

for (NSURL *const url in urls) {
dispatch_group_enter(group);

[NSFileManager.defaultManager getFileProviderServicesForItemAtURL:url
completionHandler:^(NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *const services, NSError *const error){
if (error != nil) {
qCWarning(lcFileProviderXPCUtils) << "Error getting file provider services" << error;
dispatch_group_leave(group);
return;
}

qCInfo(lcFileProviderXPCUtils) << "Got file provider services for"
<< url.absoluteString
<< "has number of services:"
<< services.count;
if (services != nil) {
@synchronized (fpServices) {
[fpServices addObject:services];
}
}
dispatch_group_leave(group);
}];
}

dispatch_group_wait(group, DISPATCH_TIME_FOREVER);

if (fpServices.count == 0) {
qCWarning(lcFileProviderXPCUtils) << "No file provider services found";
}

return fpServices.copy;
}

NSArray<NSXPCConnection *> *connectToFileProviderServices(NSArray<NSDictionary<NSFileProviderServiceName, NSFileProviderService *> *> *fpServices)
{
dispatch_group_t group = dispatch_group_create();
Expand Down
Loading