From 2a613cabaa29134435672146f645392b4f3b1178 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Mon, 5 Aug 2024 09:56:18 +0200 Subject: [PATCH] refactor: migrate `electron_login_helper` to non-deprecated API (#43182) refactor: migrate electron_login_helper to non-deprecated API --- shell/app/electron_login_helper.mm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/shell/app/electron_login_helper.mm b/shell/app/electron_login_helper.mm index dbcb0c9958..a5d562547c 100644 --- a/shell/app/electron_login_helper.mm +++ b/shell/app/electron_login_helper.mm @@ -4,12 +4,6 @@ #import -// launchApplication is deprecated; should be migrated to -// [NSWorkspace openApplicationAtURL:configuration:completionHandler:] -// UserNotifications.frameworks API -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - int main(int argc, char* argv[]) { @autoreleasepool { NSArray* pathComponents = @@ -17,11 +11,18 @@ int main(int argc, char* argv[]) { pathComponents = [pathComponents subarrayWithRange:NSMakeRange(0, [pathComponents count] - 4)]; NSString* path = [NSString pathWithComponents:pathComponents]; + NSURL* url = [NSURL fileURLWithPath:path]; - [[NSWorkspace sharedWorkspace] launchApplication:path]; + [[NSWorkspace sharedWorkspace] + openApplicationAtURL:url + configuration:NSWorkspaceOpenConfiguration.configuration + completionHandler:^(NSRunningApplication* app, NSError* error) { + if (error) { + NSLog(@"Failed to launch application: %@", error); + } else { + NSLog(@"Application launched successfully: %@", app); + } + }]; return 0; } } - -// -Wdeprecated-declarations -#pragma clang diagnostic pop