diff --git a/Sources/ActiveWinCLI/main.swift b/Sources/ActiveWinCLI/main.swift index 59b10d4..2439f02 100644 --- a/Sources/ActiveWinCLI/main.swift +++ b/Sources/ActiveWinCLI/main.swift @@ -71,9 +71,8 @@ func getWindowInformation(window: [String: Any], windowOwnerPID: pid_t) -> [Stri "memoryUsage": window[kCGWindowMemoryUsage as String] as? Int ?? 0 ] - // Run the AppleScript to get the URL if the active window is a compatible browser and accessibility permissions are enabled. + // Only run the AppleScript if active window is a compatible browser. if - !disableAccessibilityPermission, let bundleIdentifier = app.bundleIdentifier, let script = getActiveBrowserTabURLAppleScriptCommand(bundleIdentifier), let url = runAppleScript(source: script) @@ -84,19 +83,9 @@ func getWindowInformation(window: [String: Any], windowOwnerPID: pid_t) -> [Stri return output } -let disableAccessibilityPermission = CommandLine.arguments.contains("--no-accessibility-permission") let disableScreenRecordingPermission = CommandLine.arguments.contains("--no-screen-recording-permission") let enableOpenWindowsList = CommandLine.arguments.contains("--open-windows-list") -// Show accessibility permission prompt if needed. Required to get the URL of the active tab in browsers. -if - !disableAccessibilityPermission, - !AXIsProcessTrustedWithOptions(["AXTrustedCheckOptionPrompt": true] as CFDictionary) -{ - print("active-win requires the accessibility permission in “System Settings › Privacy & Security › Accessibility”.") - exit(1) -} - // Show screen recording permission prompt if needed. Required to get the complete window title. if !disableScreenRecordingPermission, diff --git a/index.d.ts b/index.d.ts index f2f360a..fd4fd55 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,14 +1,5 @@ declare namespace activeWindow { interface Options { - /** - Enable the accessibility permission check. _(macOS)_ - - Setting this to `false` will prevent the accessibility permission prompt on macOS versions 10.15 and newer. The `url` property won't be retrieved. - - @default true - */ - readonly accessibilityPermission: boolean; - /** Enable the screen recording permission check. _(macOS)_ diff --git a/index.test-d.ts b/index.test-d.ts index 4065154..c83e2d3 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -4,10 +4,7 @@ import {Result, LinuxResult, MacOSResult, WindowsResult, BaseOwner} from './inde expectType>(activeWindow()); -const result = activeWindow.sync({ - screenRecordingPermission: false, - accessibilityPermission: false -}); +const result = activeWindow.sync({screenRecordingPermission: false}); expectType(result); diff --git a/lib/macos.js b/lib/macos.js index 9a5bb1a..47c753d 100644 --- a/lib/macos.js +++ b/lib/macos.js @@ -21,9 +21,6 @@ const getArguments = options => { } const args = []; - if (options.accessibilityPermission === false) { - args.push('--no-accessibility-permission'); - } if (options.screenRecordingPermission === false) { args.push('--no-screen-recording-permission'); diff --git a/readme.md b/readme.md index d6da80a..5b071d0 100644 --- a/readme.md +++ b/readme.md @@ -50,13 +50,6 @@ Get metadata about the active window. Type: `object` -##### accessibilityPermission **(macOS only)** - -Type: `boolean`\ -Default: `true` - -Enable the accessibility permission check. Setting this to `false` will prevent the accessibility permission prompt on macOS versions 10.15 and newer. The `url` property won't be retrieved. - ##### screenRecordingPermission **(macOS only)** Type: `boolean`\