From 0d99a3ddffcbedb57f7461a394983c6dd5dac161 Mon Sep 17 00:00:00 2001 From: Tanner Date: Sun, 1 Mar 2026 23:26:50 -0800 Subject: [PATCH] Fix Swift compiler warning: remove conflicting public modifier in private extension Move requestAccessibilityPermissionPromptIfNeeded() from the private extension into the main actor body so the public protocol requirement can be satisfied without a conflicting access modifier warning. Nightshift-Task: lint-fix Nightshift-Ref: https://github.com/marcus/nightshift --- .../Services/DefaultTextCaptureService.swift | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/FreeThinker/Core/Services/DefaultTextCaptureService.swift b/FreeThinker/Core/Services/DefaultTextCaptureService.swift index 0b3db71..ba63342 100644 --- a/FreeThinker/Core/Services/DefaultTextCaptureService.swift +++ b/FreeThinker/Core/Services/DefaultTextCaptureService.swift @@ -89,6 +89,24 @@ public actor DefaultTextCaptureService: TextCaptureServiceProtocol { Logger.info("Selection capture yielded no text", category: .textCapture) throw FreeThinkerError.noSelection } + + public func requestAccessibilityPermissionPromptIfNeeded() { + let now = uptimeNanosecondsProvider() + if + let lastPromptUptime = lastPermissionPromptUptimeNanoseconds, + now >= lastPromptUptime, + (now - lastPromptUptime) < permissionPromptCooldownNanoseconds + { + return + } + + lastPermissionPromptUptimeNanoseconds = now + let alreadyTrusted = permissionPromptRequester() + Logger.info( + "Requested accessibility permission prompt trusted=\(alreadyTrusted)", + category: .textCapture + ) + } } private extension DefaultTextCaptureService { @@ -169,24 +187,6 @@ private extension DefaultTextCaptureService { return AXIsProcessTrustedWithOptions(options) } - public func requestAccessibilityPermissionPromptIfNeeded() { - let now = uptimeNanosecondsProvider() - if - let lastPromptUptime = lastPermissionPromptUptimeNanoseconds, - now >= lastPromptUptime, - (now - lastPromptUptime) < permissionPromptCooldownNanoseconds - { - return - } - - lastPermissionPromptUptimeNanoseconds = now - let alreadyTrusted = permissionPromptRequester() - Logger.info( - "Requested accessibility permission prompt trusted=\(alreadyTrusted)", - category: .textCapture - ) - } - func fallbackCaptureSelection() async -> String? { if let clipboardFallbackProvider { return clipboardFallbackProvider()