github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-08 23:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid deprecated login item methods (#48090)

Browse Source
This commit is contained in:
Samuel Attard
2025-08-17 22:00:52 -07:00
committed by GitHub
parent ed4a99ba5b
commit 3770bb31a7
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shell/browser/browser_mac.mm
View File

@@ -426,19 +426,18 @@ v8::Local<v8::Value> Browser::GetLoginItemSettings(
#else
// If the app was previously set as a LoginItem with the deprecated API,
// we should report its LoginItemSettings via the old API.
LoginItemSettings settings_deprecated = GetLoginItemSettingsDeprecated();
if (@available(macOS 13, *)) {
const std::string status =
platform_util::GetLoginItemEnabled(options.type, options.service_name);
if (status == "enabled-deprecated") {
settings = settings_deprecated;
settings = GetLoginItemSettingsDeprecated();
} else {
settings.open_at_login = status == "enabled";
settings.opened_at_login = was_launched_at_login_;
settings.status = status;
}
} else {
settings = settings_deprecated;
settings = GetLoginItemSettingsDeprecated();
}
#endif
return gin::ConvertToV8(isolate, settings);

6
shell/common/platform_util_mac.mm
View File

@@ -220,7 +220,6 @@ void Beep() {
std::string GetLoginItemEnabled(const std::string& type,
const std::string& service_name) {
bool enabled = GetLoginItemEnabledDeprecated();
if (@available(macOS 13, *)) {
SMAppService* service = GetServiceForType(type, service_name);
SMAppServiceStatus status = [service status];
@@ -232,10 +231,11 @@ std::string GetLoginItemEnabled(const std::string& type,
return "requires-approval";
else if (status == SMAppServiceStatusNotFound) {
// If the login item was enabled with the old API, return that.
return enabled ? "enabled-deprecated" : "not-found";
return GetLoginItemEnabledDeprecated() ? "enabled-deprecated"
: "not-found";
}
}
return enabled ? "enabled" : "not-registered";
return GetLoginItemEnabledDeprecated() ? "enabled" : "not-registered";
}
bool SetLoginItemEnabled(const std::string& type,