Move splay and splay loop type to actually delay sofa

macadmins · Jul 18, 2024 · 1ff87be · 1ff87be
1 parent 9539d24
commit 1ff87be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Nudge/UI/Defaults.swift b/Nudge/UI/Defaults.swift
@@ -28,7 +28,7 @@ struct Globals {
     static let nudgeJSONPreferences = NetworkFileManager().getNudgeJSONPreferences()
     // Device Properties
     static let gdmfAssets = NetworkFileManager().getGDMFAssets()
-    static let sofaAssets = NetworkFileManager().getSOFAAssets()
+    static var sofaAssets: MacOSDataFeed?
     static let hardwareModelIDs = DeviceManager().getHardwareModelIDs()
 }
 

diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
@@ -177,6 +177,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if OptionalFeatureVariables.utilizeSOFAFeed {
             var selectedOS: OSInformation?
             var foundMatch = false
+            Globals.sofaAssets = NetworkFileManager().getSOFAAssets()
             if let macOSSOFAAssets = Globals.sofaAssets?.osVersions {
                 for osVersion in macOSSOFAAssets {
                     if PrefsWrapper.requiredMinimumOSVersion == "latest" {
@@ -281,10 +282,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         handleSMAppService()
         checkForBadProfilePath()
         handleCommandLineArguments()
+        applyRandomDelayIfNecessary()
         applyGracePeriodLogic()
         sofaPreLaunchLogic()
         applydelayNudgeEventLogic()
-        applyRandomDelayIfNecessary()
         updateNudgeState()
         handleSoftwareUpdateRequirements()
     }
@@ -355,7 +356,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if UserExperienceVariables.randomDelay && !CommandLine.arguments.contains("-disable-randomDelay") {
             let delaySeconds = Int.random(in: 1...UserExperienceVariables.maxRandomDelayInSeconds)
             LogManager.notice("Delaying initial run (in seconds) by: \(delaySeconds)", logger: uiLog)
-            sleep(UInt32(delaySeconds))
+
+            let delayDate = Date().addingTimeInterval(TimeInterval(delaySeconds))
+            while Date() < delayDate {
+                RunLoop.current.run(mode: .default, before: delayDate)
+            }
+
+            LogManager.notice("Finished delay", logger: uiLog)
         }
     }