Merge pull request #378 from samuelzamvil/main

Resolution for issue #377 - "default" targetedOSVersionsRule is Ignored/Overwritten when there's multiple osVersionRequirements
macadmins · Aug 2, 2022 · 24e2097 · 24e2097
2 parents 3059464 + 5fa0900
commit 24e2097
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Nudge/Utilities/Preferences.swift b/Nudge/Utilities/Preferences.swift
@@ -55,6 +55,7 @@ func getOSVersionRequirementsProfile() -> OSVersionRequirement? {
     var fullMatch = OSVersionRequirement()
     var partialMatch = OSVersionRequirement()
     var defaultMatch = OSVersionRequirement()
+    var defaultMatchSet = false
     if Utils().demoModeEnabled() || Utils().unitTestingEnabled() {
         return nil
     }
@@ -73,7 +74,8 @@ func getOSVersionRequirementsProfile() -> OSVersionRequirement? {
                 partialMatch = subPreferences
             } else if subPreferences.targetedOSVersionsRule == "default" {
                 defaultMatch = subPreferences
-            } else {
+                defaultMatchSet = true
+            } else if !(defaultMatchSet) {
                 defaultMatch = subPreferences
             }
         }
@@ -94,6 +96,7 @@ func getOSVersionRequirementsJSON() -> OSVersionRequirement? {
     var fullMatch = OSVersionRequirement()
     var partialMatch = OSVersionRequirement()
     var defaultMatch = OSVersionRequirement()
+    var defaultMatchSet = false
     if Utils().demoModeEnabled() || Utils().unitTestingEnabled() {
         return nil
     }
@@ -106,7 +109,8 @@ func getOSVersionRequirementsJSON() -> OSVersionRequirement? {
                 partialMatch = subPreferences
             } else if subPreferences.targetedOSVersionsRule == "default" {
                 defaultMatch = subPreferences
-            } else if subPreferences.targetedOSVersionsRule == nil {
+                defaultMatchSet = true
+            } else if subPreferences.targetedOSVersionsRule == nil && !(defaultMatchSet) {
                 defaultMatch = subPreferences
             }
         }