Skip to content
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

Delay write of plist file to fix frequent notification issue on Ventura #1461

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Delay write of plist file to fix frequent notification issue on Ventura #1461

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
12 changes: 8 additions & 4 deletions ShadowsocksX-NG/LaunchAgentUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func generateSSLocalLauchAgentPlist() -> Bool {
let sslocalPath = NSHomeDirectory() + APP_SUPPORT_DIR + "ss-local/ss-local"
let logFilePath = NSHomeDirectory() + "/Library/Logs/ss-local.log"
let launchAgentDirPath = NSHomeDirectory() + LAUNCH_AGENT_DIR
let plistTempFilepath = NSHomeDirectory() + APP_SUPPORT_DIR + LAUNCH_AGENT_CONF_SSLOCAL_NAME
let plistFilepath = launchAgentDirPath + LAUNCH_AGENT_CONF_SSLOCAL_NAME

// Ensure launch agent directory is existed.
Expand Down Expand Up @@ -69,9 +70,10 @@ func generateSSLocalLauchAgentPlist() -> Bool {
"ProgramArguments": arguments,
"EnvironmentVariables": ["DYLD_LIBRARY_PATH": dyld_library_paths.joined(separator: ":")]
]
dict.write(toFile: plistFilepath, atomically: true)
let Sha1Sum = getFileSHA1Sum(plistFilepath)
dict.write(toFile: plistTempFilepath, atomically: true)
let Sha1Sum = getFileSHA1Sum(plistTempFilepath)
if oldSha1Sum != Sha1Sum {
dict.write(toFile: plistFilepath, atomically: true)
NSLog("generateSSLocalLauchAgentPlist - File has been changed.")
return true
} else {
Expand Down Expand Up @@ -283,6 +285,7 @@ func generatePrivoxyLauchAgentPlist() -> Bool {
let privoxyPath = NSHomeDirectory() + APP_SUPPORT_DIR + "privoxy/privoxy"
let logFilePath = NSHomeDirectory() + "/Library/Logs/privoxy.log"
let launchAgentDirPath = NSHomeDirectory() + LAUNCH_AGENT_DIR
let plistTempFilePath = NSHomeDirectory() + APP_SUPPORT_DIR + LAUNCH_AGENT_CONF_PRIVOXY_NAME
let plistFilepath = launchAgentDirPath + LAUNCH_AGENT_CONF_PRIVOXY_NAME

// Ensure launch agent directory is existed.
Expand All @@ -303,9 +306,10 @@ func generatePrivoxyLauchAgentPlist() -> Bool {
"StandardErrorPath": logFilePath,
"ProgramArguments": arguments
]
dict.write(toFile: plistFilepath, atomically: true)
let Sha1Sum = getFileSHA1Sum(plistFilepath)
dict.write(toFile: plistTempFilePath, atomically: true)
let Sha1Sum = getFileSHA1Sum(plistTempFilePath)
if oldSha1Sum != Sha1Sum {
dict.write(toFile: plistFilepath, atomically: true)
return true
} else {
return false
Expand Down