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

chore: remove accessibility permission check and option #179

Closed
wants to merge 2 commits into from
Closed

chore: remove accessibility permission check and option #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c16068
fix: remove accessibility prompt 🐛
kentbetita Feb 22, 2024
6e38534
chore: remove `accessibilityPermission` option 🔧
kentbetita Feb 24, 2024
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
13 changes: 1 addition & 12 deletions Sources/ActiveWinCLI/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand Down
9 changes: 0 additions & 9 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)_

Expand Down
5 changes: 1 addition & 4 deletions index.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import {Result, LinuxResult, MacOSResult, WindowsResult, BaseOwner} from './inde

expectType<Promise<Result | undefined>>(activeWindow());

const result = activeWindow.sync({
screenRecordingPermission: false,
accessibilityPermission: false
});
const result = activeWindow.sync({screenRecordingPermission: false});

expectType<Result | undefined>(result);

Expand Down
3 changes: 0 additions & 3 deletions lib/macos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
7 changes: 0 additions & 7 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`\
Expand Down
Loading