Log/defer Nudge activation when screen is locked

macadmins · Jul 26, 2022 · 8eb8041 · 8eb8041
1 parent 57dbdc6
commit 8eb8041
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Nudge/UI/ContentView.swift b/Nudge/UI/ContentView.swift
@@ -36,6 +36,7 @@ class ViewState: ObservableObject {
     @Published var userRequiredMinimumOSVersion = nudgeDefaults.object(forKey: "requiredMinimumOSVersion") as? String ?? "0.0"
     @Published var userSessionDeferrals = nudgeDefaults.object(forKey: "userSessionDeferrals") as? Int ?? 0
     @Published var blurredBackground =  [BlurWindowController]()
+    @Published var screenCurrentlyLocked = false
 }
 
 class LogState {

diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
@@ -64,6 +64,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             object: nil,
             queue: .main
         ) { notification in
+            nudgePrimaryState.screenCurrentlyLocked = true
             utilsLog.info("\("Screen was locked", privacy: .public)")
         }
 
@@ -72,6 +73,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             object: nil,
             queue: .main
         ) { notification in
+            nudgePrimaryState.screenCurrentlyLocked = false
             utilsLog.info("\("Screen was unlocked", privacy: .public)")
         }
 

diff --git a/Nudge/Utilities/UILogic.swift b/Nudge/Utilities/UILogic.swift
@@ -154,6 +154,12 @@ func needToActivateNudge() -> Bool {
         return false
     }
 
+    // Don't nudge if screen is locked
+    if nudgePrimaryState.screenCurrentlyLocked {
+        uiLog.info("\("Ignoring Nudge activation - Screen is currently locked", privacy: .public)")
+        return false
+    }
+
     // Don't nudge if major upgrade is frontmostApplication
     if majorUpgradeAppPathExists {
         if NSURL.fileURL(withPath: majorUpgradeAppPath) == frontmostApplication?.bundleURL {