new utilizeSOFAFeed preference - defaults to false

MagerValp · Jul 18, 2024 · acbf33f · acbf33f
1 parent 7308668
commit acbf33f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Example Assets/com.github.macadmins.Nudge.tester.json b/Example Assets/com.github.macadmins.Nudge.tester.json
@@ -14,7 +14,8 @@
             "com.microsoft.VSCode",
             "us.zoom.xos"
         ],
-        "terminateApplicationsOnLaunch": false
+        "terminateApplicationsOnLaunch": false,
+        "utilizeSOFAFeed": true
     },
     "osVersionRequirements": [
         {

diff --git a/Nudge/Preferences/DefaultPreferencesNudge.swift b/Nudge/Preferences/DefaultPreferencesNudge.swift
@@ -142,6 +142,12 @@ struct OptionalFeatureVariables {
         optionalFeaturesJSON?.terminateApplicationsOnLaunch ??
         false
     }
+
+    static var utilizeSOFAFeed: Bool {
+        optionalFeaturesProfile?["utilizeSOFAFeedh"] as? Bool ??
+        optionalFeaturesJSON?.utilizeSOFAFeed ??
+        false
+    }
 }
 
 // OS Version Requirements

diff --git a/Nudge/Preferences/PreferencesStructure.swift b/Nudge/Preferences/PreferencesStructure.swift
@@ -53,7 +53,7 @@ struct OptionalFeatures: Codable {
     var acceptableApplicationBundleIDs, acceptableAssertionApplicationNames: [String]?
     var acceptableAssertionUsage, acceptableCameraUsage, acceptableScreenSharingUsage, aggressiveUserExperience, aggressiveUserFullScreenExperience, asynchronousSoftwareUpdate, attemptToBlockApplicationLaunches, attemptToFetchMajorUpgrade: Bool?
     var blockedApplicationBundleIDs: [String]?
-    var disableSoftwareUpdateWorkflow, enforceMinorUpdates, terminateApplicationsOnLaunch: Bool?
+    var disableSoftwareUpdateWorkflow, enforceMinorUpdates, terminateApplicationsOnLaunch, utilizeSOFAFeed: Bool?
 }
 
 // MARK: OptionalFeatures convenience initializers and mutators
@@ -88,7 +88,8 @@ extension OptionalFeatures {
         blockedApplicationBundleIDs: [String]? = nil,
         disableSoftwareUpdateWorkflow: Bool? = nil,
         enforceMinorUpdates: Bool? = nil,
-        terminateApplicationsOnLaunch: Bool? = nil
+        terminateApplicationsOnLaunch: Bool? = nil,
+        utilizeSOFAFeed: Bool? = nil
     ) -> OptionalFeatures {
         return OptionalFeatures(
             acceptableApplicationBundleIDs: acceptableApplicationBundleIDs ?? self.acceptableApplicationBundleIDs,
@@ -104,7 +105,8 @@ extension OptionalFeatures {
             blockedApplicationBundleIDs: blockedApplicationBundleIDs ?? self.blockedApplicationBundleIDs,
             disableSoftwareUpdateWorkflow: disableSoftwareUpdateWorkflow ?? self.disableSoftwareUpdateWorkflow,
             enforceMinorUpdates: enforceMinorUpdates ?? self.enforceMinorUpdates,
-            terminateApplicationsOnLaunch: terminateApplicationsOnLaunch ?? self.terminateApplicationsOnLaunch
+            terminateApplicationsOnLaunch: terminateApplicationsOnLaunch ?? self.terminateApplicationsOnLaunch,
+            utilizeSOFAFeed: utilizeSOFAFeed ?? self.utilizeSOFAFeed
         )
     }
 }

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -825,6 +825,9 @@ struct NetworkFileManager {
     }
 
     func getSOFAAssets() -> MacOSDataFeed? {
+        if !OptionalFeatureVariables.utilizeSOFAFeed {
+            return nil
+        }
         if let url = URL(string: "https://sofa.macadmins.io/v1/macos_data_feed.json") {
             let sofaData = SOFA().URLSync(url: url)
             if (sofaData.error == nil) {