✨ Loop can now ask user for Screen Recording access

MrKai77 · Sep 3, 2023 · b1f7997 · b1f7997
1 parent b251c83
commit b1f7997
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/Loop/Helpers/PermissionsManager.swift b/Loop/Helpers/PermissionsManager.swift
@@ -9,6 +9,11 @@ import SwiftUI
 import Defaults
 
 class PermissionsManager {
+    static func requestAccess() {
+        PermissionsManager.Accessibility.requestAccess()
+        PermissionsManager.ScreenRecording.requestAccess()
+    }
+
     class Accessibility {
         static func getStatus() -> Bool {
             // Get current state for accessibility access
@@ -18,14 +23,20 @@ class PermissionsManager {
             return status
         }
 
-        static func requestAccess() {
+        @discardableResult
+        static func requestAccess() -> Bool {
             if PermissionsManager.Accessibility.getStatus() {
-                return
+                return true
             }
             let alert = NSAlert()
             alert.messageText = "\(Bundle.main.appName) Needs Accessibility Permissions"
-            alert.informativeText = "Please grant accessibility access to be able to resize windows."
+            alert.informativeText = "Please grant access to be able to resize windows."
             alert.runModal()
+
+            let options: NSDictionary = [kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true]
+            let status = AXIsProcessTrustedWithOptions(options)
+
+            return status
         }
     }
 
@@ -41,7 +52,7 @@ class PermissionsManager {
 
             let alert = NSAlert()
             alert.messageText = "\(Bundle.main.appName) Needs Screen Recording Permissions"
-            alert.informativeText = "Please grant screen recording access to be able to resize windows (with animation)."
+            alert.informativeText = "Screen recording permissions are required to animate windows being resized."
             alert.runModal()
 
             CGRequestScreenCaptureAccess()

diff --git a/Loop/LoopApp.swift b/Loop/LoopApp.swift
@@ -92,10 +92,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationDidFinishLaunching(_ notification: Notification) {
         NSApp.setActivationPolicy(.accessory)
 
-        // Check accessibility access, then if access is not granted,
-        // show a more informative alert asking for accessibility access
+        // Check & ask for accessibility access
         PermissionsManager.Accessibility.requestAccess()
-        PermissionsManager.ScreenRecording.requestAccess()
 
         iconManager.restoreCurrentAppIcon()
 

diff --git a/Loop/Settings/Views/GeneralSettingsView.swift b/Loop/Settings/Views/GeneralSettingsView.swift
@@ -46,6 +46,11 @@ struct GeneralSettingsView: View {
                         BetaIndicator("BETA")
                     }
                 }
+                .onChange(of: animateWindowResizes) { _ in
+                    if animateWindowResizes == true {
+                        PermissionsManager.ScreenRecording.requestAccess()
+                    }
+                }
 
                 Slider(value: $windowPadding,
                        in: 0...25,
@@ -124,16 +129,14 @@ struct GeneralSettingsView: View {
                     Spacer()
 
                     Button("Refresh Status", action: {
-                        PermissionsManager.Accessibility.requestAccess()
+                        PermissionsManager.requestAccess()
                         self.isAccessibilityAccessGranted = PermissionsManager.Accessibility.getStatus()
-
-                        PermissionsManager.ScreenRecording.requestAccess()
                         self.isScreenRecordingAccessGranted = PermissionsManager.ScreenRecording.getStatus()
                     })
                     .buttonStyle(.link)
                     .foregroundStyle(Color.accentColor)
-                    .disabled(isAccessibilityAccessGranted)
-                    .opacity(isAccessibilityAccessGranted ? 0.6 : 1)
+                    .disabled(isAccessibilityAccessGranted && isScreenRecordingAccessGranted)
+                    .opacity(isAccessibilityAccessGranted ? isScreenRecordingAccessGranted ? 0.6 : 1 : 1)
                     .help("Refresh the current accessibility permissions")
                     .onAppear {
                         self.isAccessibilityAccessGranted = PermissionsManager.Accessibility.getStatus()