Merge pull request #146 from wakatime/feature/status-bar-icon-disabled

Show indicator when a11y permission disabled

WakaTime/AppDelegate.swift

@@ -2,19 +2,18 @@ import AppUpdater
 import Cocoa
 import UserNotifications
 
-class AppDelegate: NSObject, NSApplicationDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate {
     var window: NSWindow!
     var statusBarItem: NSStatusItem!
+    var statusBarA11yItem: NSMenuItem!
+    var statusBarA11yStatus: Bool = true
     var settingsWindowController = SettingsWindowController()
     var monitoredAppsWindowController = MonitoredAppsWindowController()
     var wakaTime: WakaTime?
 
     let updater = AppUpdater(owner: "wakatime", repo: "macos-wakatime")
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-
-        wakaTime = WakaTime()
-
         // Handle deep links
         let eventManager = NSAppleEventManager.shared()
         eventManager.setEventHandler(
@@ -29,6 +28,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         let menu = NSMenu()
 
+        statusBarA11yItem = NSMenuItem(
+            title: "* A11y permission needed *",
+            action: #selector(AppDelegate.a11yClicked(_:)),
+            keyEquivalent: "")
+        statusBarA11yItem.isHidden = true
+        menu.addItem(statusBarA11yItem)
         menu.addItem(withTitle: "Dashboard", action: #selector(AppDelegate.dashboardClicked(_:)), keyEquivalent: "")
         menu.addItem(withTitle: "Settings", action: #selector(AppDelegate.settingsClicked(_:)), keyEquivalent: "")
         menu.addItem(withTitle: "Monitored Apps", action: #selector(AppDelegate.monitoredAppsClicked(_:)), keyEquivalent: "")
@@ -38,6 +43,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         menu.addItem(withTitle: "Quit", action: #selector(AppDelegate.quitClicked(_:)), keyEquivalent: "")
 
         statusBarItem.menu = menu
+
+        wakaTime = WakaTime(self)
     }
 
     @objc func handleGetURL(_ event: NSAppleEventDescriptor, withReplyEvent replyEvent: NSAppleEventDescriptor) {
@@ -93,10 +100,26 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
+    @objc func a11yClicked(_ sender: AnyObject) {
+        a11yStatusChanged(Accessibility.requestA11yPermission())
+    }
+
     @objc func quitClicked(_ sender: AnyObject) {
         NSApplication.shared.terminate(self)
     }
 
+    func a11yStatusChanged(_ hasPermission: Bool) {
+        guard statusBarA11yStatus != hasPermission else { return }
+
+        statusBarA11yStatus = hasPermission
+        if hasPermission {
+            statusBarItem.button?.image = NSImage(named: NSImage.Name("WakaTime"))
+        } else {
+            statusBarItem.button?.image = NSImage(named: NSImage.Name("WakaTimeDisabled"))
+        }
+        statusBarA11yItem.isHidden = hasPermission
+    }
+
     private func showSettings() {
         NSApp.activate(ignoringOtherApps: true)
         settingsWindowController.showWindow(self)

WakaTime/Helpers/Accessibility.swift

@@ -1,12 +1,10 @@
 import AppKit
 
 class Accessibility {
-    public static func requestA11yPermission() {
+    public static func requestA11yPermission() -> Bool {
         let prompt = kAXTrustedCheckOptionPrompt.takeUnretainedValue() as String
         let options: NSDictionary = [prompt: true]
         let appHasPermission = AXIsProcessTrustedWithOptions(options)
-        if appHasPermission {
-            // print("has a11y permission")
-        }
+        return appHasPermission
     }
 }

WakaTime/Resources/Assets.xcassets/WakaTimeDisabled.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "64.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

WakaTime/WakaTime.swift

@@ -6,6 +6,7 @@ class WakaTime {
     // MARK: Watcher
 
     let watcher = Watcher()
+    let delegate: StatusBarDelegate
 
     // MARK: Watcher State
 
@@ -24,14 +25,19 @@ class WakaTime {
 
     // MARK: Initialization and Setup
 
-    init() {
+    init(_ delegate: StatusBarDelegate) {
+        self.delegate = delegate
+
         Dependencies.installDependencies()
         if SettingsManager.shouldRegisterAsLoginItem() { SettingsManager.registerAsLoginItem() }
-        Accessibility.requestA11yPermission()
+        if !Accessibility.requestA11yPermission() {
+            delegate.a11yStatusChanged(false)
+        }
 
         configureFirebase()
         checkForApiKey()
         watcher.eventHandler = handleEvent
+        watcher.statusBarDelegate = delegate
     }
 
     private func configureFirebase() {
@@ -115,3 +121,7 @@ class WakaTime {
         }
     }
 }
+
+protocol StatusBarDelegate {
+    func a11yStatusChanged(_ hasPermission: Bool) -> Void
+}

WakaTime/Watcher.swift

@@ -8,6 +8,7 @@ class Watcher: NSObject {
 
     var appVersions: [String: String] = [:]
     var eventHandler: ((_ app: NSRunningApplication, _ path: URL, _ isWrite: Bool, _ isBuilding: Bool) -> Void)?
+    var statusBarDelegate: StatusBarDelegate?
     var isBuilding = false
     var activeApp: NSRunningApplication?
     private var observer: AXObserver?
@@ -117,8 +118,10 @@ class Watcher: NSObject {
                 observeActivityText(activeWindow: activeWindow)
             }
             // NSLog("Watching for file changes on \(app.localizedName ?? "nil")")
+            self.statusBarDelegate?.a11yStatusChanged(true)
         } catch {
             NSLog("Failed to setup AXObserver: \(error.localizedDescription)")
+            self.statusBarDelegate?.a11yStatusChanged(false)
         }
     }