fix userSessionDeferral log events

macadmins · Feb 22, 2024 · 50c34ad · 50c34ad
1 parent 1099da8
commit 50c34ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/Nudge/UI/Common/DeferView.swift b/Nudge/UI/Common/DeferView.swift
@@ -69,6 +69,7 @@ struct DeferView: View {
         appState.shouldExit = true
         appState.userQuitDeferrals += 1
         appState.userDeferrals = appState.userSessionDeferrals + appState.userQuitDeferrals
+        LoggerUtilities().logUserSessionDeferrals()
         LoggerUtilities().logUserQuitDeferrals()
         LoggerUtilities().logUserDeferrals()
         UIUtilities().userInitiatedExit()

diff --git a/Nudge/UI/Common/QuitButtons.swift b/Nudge/UI/Common/QuitButtons.swift
@@ -120,6 +120,7 @@ struct QuitButtons: View {
         // Update deferral UI logic
         appState.userQuitDeferrals += 1
         appState.userDeferrals = appState.userSessionDeferrals + appState.userQuitDeferrals
+        LoggerUtilities().logUserSessionDeferrals()
         LoggerUtilities().logUserQuitDeferrals()
         LoggerUtilities().logUserDeferrals()
         UIUtilities().userInitiatedExit()

diff --git a/Nudge/Utilities/UILogic.swift b/Nudge/Utilities/UILogic.swift
@@ -172,22 +172,9 @@ private func logControllers() {
 
 private func logDeferralStates() {
     LoggerUtilities().logRequiredMinimumOSVersion()
-    LoggerUtilities().logUserDeferrals()
+    LoggerUtilities().logUserSessionDeferrals()
     LoggerUtilities().logUserQuitDeferrals()
-    logUserSessionDeferrals()
-}
-
-private func logUserSessionDeferrals(resetCount: Bool = false) {
-    if CommandLineUtilities().demoModeEnabled() {
-        nudgePrimaryState.userSessionDeferrals = 0
-        return
-    }
-    if resetCount {
-        nudgePrimaryState.userSessionDeferrals = 0
-        Globals.nudgeDefaults.set(nudgePrimaryState.userSessionDeferrals, forKey: "userSessionDeferrals")
-    } else {
-        Globals.nudgeDefaults.set(nudgePrimaryState.userSessionDeferrals, forKey: "userSessionDeferrals")
-    }
+    LoggerUtilities().logUserDeferrals()
 }
 
 func needToActivateNudge() -> Bool {
@@ -228,9 +215,9 @@ private func processNudgeEvent() {
 
 private func resetAllDeferralValues() {
     LoggerUtilities().logRequiredMinimumOSVersion()
-    LoggerUtilities().logUserDeferrals(resetCount: true)
+    LoggerUtilities().logUserSessionDeferrals(resetCount: true)
     LoggerUtilities().logUserQuitDeferrals(resetCount: true)
-    logUserSessionDeferrals(resetCount: true)
+    LoggerUtilities().logUserDeferrals(resetCount: true)
     Globals.nudgeDefaults.removeObject(forKey: "deferRunUntil")
 }
 

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -19,6 +19,9 @@ struct AppStateManager {
         LogManager.info("Activating Nudge", logger: utilsLog)
         nudgePrimaryState.lastRefreshTime = DateManager().getCurrentDate()
         guard let mainWindow = NSApp.windows.first else { return }
+        LoggerUtilities().logUserSessionDeferrals()
+        LoggerUtilities().logUserQuitDeferrals()
+        LoggerUtilities().logUserDeferrals()
 
         if DateManager().pastRequiredInstallationDate() && OptionalFeatureVariables.aggressiveUserFullScreenExperience {
             UIUtilities().centerNudge()
@@ -604,6 +607,10 @@ struct LoggerUtilities {
         updateDeferralCount(&nudgePrimaryState.userQuitDeferrals, resetCount: resetCount, key: "userQuitDeferrals")
     }
 
+    func logUserSessionDeferrals(resetCount: Bool = false) {
+        updateDeferralCount(&nudgePrimaryState.userSessionDeferrals, resetCount: resetCount, key: "userSessionDeferrals")
+    }
+
     private func updateDeferralCount(_ count: inout Int, resetCount: Bool, key: String) {
         if CommandLineUtilities().demoModeEnabled() {
             count = 0