Merge pull request #155 from wakatime/main

Release v3.4.1

.swiftlint.yml

@@ -20,7 +20,6 @@ opt_in_rules:
   - closure_spacing
   - contains_over_first_not_nil
   - empty_count
-  - explicit_enum_raw_value
   - explicit_init
   - fatal_error_message
   - first_where

WakaTime/AppDelegate.swift

@@ -8,6 +8,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate {
     var statusBarA11yItem: NSMenuItem!
     var statusBarA11ySeparator: NSMenuItem!
     var statusBarA11yStatus: Bool = true
+    var notificationsEnabled: Bool = false
     var settingsWindowController = SettingsWindowController()
     var monitoredAppsWindowController = MonitoredAppsWindowController()
     var wakaTime: WakaTime?
@@ -49,6 +50,18 @@ class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate {
         statusBarItem.menu = menu
 
         wakaTime = WakaTime(self)
+
+        // request notifications permission
+        UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound]) { granted, error in
+            guard granted else {
+                if let msg = error?.localizedDescription {
+                    NSLog(msg)
+                    print(msg)
+                }
+                return
+            }
+            self.notificationsEnabled = true
+        }
     }
 
     @objc func handleGetURL(_ event: NSAppleEventDescriptor, withReplyEvent replyEvent: NSAppleEventDescriptor) {
@@ -78,7 +91,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate {
     }
 
     @objc func checkForUpdatesClicked(_ sender: AnyObject) {
-        updater.check().catch(policy: .allErrors) { error in
+        updater.check {
+            if self.notificationsEnabled {
+                self.sendNotification(title: "Updating to latest release")
+            }
+        }.catch(policy: .allErrors) { error in
             if error.isCancelled {
                 let alert = NSAlert()
                 alert.messageText = "Up to date"
@@ -134,4 +151,25 @@ class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate {
         NSApp.activate(ignoringOtherApps: true)
         monitoredAppsWindowController.showWindow(self)
     }
+
+    private func sendNotification(title: String, body: String = "") {
+        let content = UNMutableNotificationContent()
+        content.title = title
+
+        if !body.isEmpty {
+            content.body = body
+        }
+
+        let uuidString = UUID().uuidString
+        let request = UNNotificationRequest(
+        identifier: uuidString,
+        content: content, trigger: nil)
+
+        let notificationCenter = UNUserNotificationCenter.current()
+        notificationCenter.requestAuthorization(options: [.alert, .sound]) { granted, _ in
+            guard granted else { return }
+
+            notificationCenter.add(request)
+        }
+    }
 }

WakaTime/Helpers/MonitoringManager.swift

@@ -39,7 +39,7 @@ class MonitoringManager {
     }
 
     static func isAppElectron(for bundleId: String) -> Bool {
-        return electronAppIds.contains(bundleId)
+        electronAppIds.contains(bundleId)
     }
 
     static func isAppElectron(_ app: NSRunningApplication) -> Bool {

WakaTime/WakaTime.swift

@@ -1,6 +1,6 @@
-import Foundation
 import AppKit
 import Firebase
+import Foundation
 
 class WakaTime: HeartbeatEventHandler {
     // MARK: Watcher
@@ -133,10 +133,10 @@ enum EntityType: String {
     case app
 }
 
-protocol StatusBarDelegate {
-    func a11yStatusChanged(_ hasPermission: Bool) -> Void
+protocol StatusBarDelegate: AnyObject {
+    func a11yStatusChanged(_ hasPermission: Bool)
 }
 
 protocol HeartbeatEventHandler {
-    func handleHeartbeatEvent(app: NSRunningApplication, entity: String, entityType: EntityType, isWrite: Bool, isBuilding: Bool) -> Void
+    func handleHeartbeatEvent(app: NSRunningApplication, entity: String, entityType: EntityType, isWrite: Bool, isBuilding: Bool)
 }