perf: prevent possible frequent permissions check
This commit is contained in:
1 parent
3f2f391c93
commit
216563b635
2 files changed
+12
-4
No files matched your search
@@ -5,6 +5,7 @@ import ScreenCaptureKit.SCShareableContent
|
|||||||
class SystemPermissions {
|
class SystemPermissions {
|
||||||
static var preStartupPermissionsPassed = false
|
static var preStartupPermissionsPassed = false
|
||||||
private static var timer: DispatchSourceTimer!
|
private static var timer: DispatchSourceTimer!
|
||||||
|
private static var timerIsFrequent = false
|
||||||
|
|
||||||
static func ensurePermissionsAreGranted() {
|
static func ensurePermissionsAreGranted() {
|
||||||
timer = DispatchSource.makeTimerSource(queue: BackgroundWork.permissionsCheckOnTimerQueue.strongUnderlyingQueue)
|
timer = DispatchSource.makeTimerSource(queue: BackgroundWork.permissionsCheckOnTimerQueue.strongUnderlyingQueue)
|
||||||
@@ -23,6 +24,11 @@ class SystemPermissions {
|
|||||||
checkPermissionsPreStartup()
|
checkPermissionsPreStartup()
|
||||||
} else {
|
} else {
|
||||||
checkPermissionsPostStartup()
|
checkPermissionsPostStartup()
|
||||||
|
if App.app.permissionsWindow.isVisible && !timerIsFrequent {
|
||||||
|
setFrequentTimer()
|
||||||
|
} else if !App.app.permissionsWindow.isVisible && timerIsFrequent {
|
||||||
|
setInfrequentTimer()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
Menubar.togglePermissionCallout(ScreenRecordingPermission.status != .granted)
|
Menubar.togglePermissionCallout(ScreenRecordingPermission.status != .granted)
|
||||||
@@ -53,14 +59,17 @@ class SystemPermissions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static func setInfrequentTimer() {
|
static func setInfrequentTimer() {
|
||||||
|
timerIsFrequent = false
|
||||||
timer.schedule(deadline: .now() + 5, repeating: 5, leeway: .seconds(1))
|
timer.schedule(deadline: .now() + 5, repeating: 5, leeway: .seconds(1))
|
||||||
}
|
}
|
||||||
|
|
||||||
static func setFrequentTimer() {
|
static func setFrequentTimer() {
|
||||||
|
timerIsFrequent = true
|
||||||
timer.schedule(deadline: .now(), repeating: 0.5, leeway: .milliseconds(500))
|
timer.schedule(deadline: .now(), repeating: 0.5, leeway: .milliseconds(500))
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func setImmediateTimer() {
|
private static func setImmediateTimer() {
|
||||||
|
timerIsFrequent = false
|
||||||
timer.schedule(deadline: .now(), repeating: .never, leeway: .never)
|
timer.schedule(deadline: .now(), repeating: .never, leeway: .never)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ class PermissionsWindow: NSWindow {
|
|||||||
override var canBecomeKey: Bool { canBecomeKey_ }
|
override var canBecomeKey: Bool { canBecomeKey_ }
|
||||||
|
|
||||||
convenience init() {
|
convenience init() {
|
||||||
self.init(contentRect: .zero, styleMask: [.titled, .miniaturizable, .closable], backing: .buffered, defer: false)
|
self.init(contentRect: .zero, styleMask: [.titled, .closable], backing: .buffered, defer: false)
|
||||||
delegate = self
|
delegate = self
|
||||||
setupWindow()
|
setupWindow()
|
||||||
setupView()
|
setupView()
|
||||||
@@ -16,10 +16,10 @@ class PermissionsWindow: NSWindow {
|
|||||||
func show() {
|
func show() {
|
||||||
guard !isVisible else { return }
|
guard !isVisible else { return }
|
||||||
Logger.debug { "" }
|
Logger.debug { "" }
|
||||||
SystemPermissions.setFrequentTimer()
|
|
||||||
center()
|
center()
|
||||||
App.shared.activate(ignoringOtherApps: true)
|
App.shared.activate(ignoringOtherApps: true)
|
||||||
makeKeyAndOrderFront(nil)
|
makeKeyAndOrderFront(nil)
|
||||||
|
SystemPermissions.setFrequentTimer()
|
||||||
}
|
}
|
||||||
|
|
||||||
func updatePermissionViews() {
|
func updatePermissionViews() {
|
||||||
@@ -33,7 +33,7 @@ class PermissionsWindow: NSWindow {
|
|||||||
title = NSLocalizedString("AltTab needs some permissions", comment: "")
|
title = NSLocalizedString("AltTab needs some permissions", comment: "")
|
||||||
hidesOnDeactivate = false
|
hidesOnDeactivate = false
|
||||||
isReleasedWhenClosed = false
|
isReleasedWhenClosed = false
|
||||||
styleMask.insert([.miniaturizable, .closable])
|
styleMask.insert([.closable])
|
||||||
}
|
}
|
||||||
|
|
||||||
private func setupView() {
|
private func setupView() {
|
||||||
@@ -99,7 +99,6 @@ extension PermissionsWindow: NSWindowDelegate {
|
|||||||
return false // prevent the close; termination will close everything once
|
return false // prevent the close; termination will close everything once
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SystemPermissions.setInfrequentTimer()
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user