DeferMajorVersions improvements

- Only check RecommendedUpdates at app launch and when pref key changes
- README update
- Jamf Pro Custom JSON Scheme update

Author: jordywitteman

Jamf Pro Custom Schema/Jamf Pro Custom Schema.json

@@ -105,6 +105,21 @@
         }
       ]
     },
+    "HideMajorUpdates": {
+      "title": "Hide major macOS updates",
+      "description": "Ignore macOS major updates. This will prevent the menu bar icon and the macOS version info item from showing an available major update. Only applicable to macOS 12.3 and higher",
+      "type": "boolean",
+      "options": {
+        "enum_titles": ["Hide", "Show"],
+        "infoText": "Key name: HideMajorUpdates"
+      },
+      "links": [
+        {
+          "rel": "Documentation",
+          "href": "https://github.com/root3nl/SupportApp"
+        }
+      ]
+    },
     "CustomColor": {
       "title": "Custom Color",
       "description": "HEX color in RGB format. Example: #8cc63f. Leave empty to use macOS Accent Color",

README.md

@@ -182,6 +182,7 @@ All general settings
 | StatusBarIcon | String | Root3 Logo | Path to the status bar icon shown in the menu bar. Recommended: PNG, 16x16 points. Icons larger than 22 points will automatically be resized to 16 points. A subfolder in `/Library/Application Support/` is the recommended location due to sandboxing | `/Library/Application Support/Your Company/statusbaricon.png` |
 | StatusBarIconSFSymbol | String | Root3 Logo | Custom status bar icon using an SF Symbol. Ignored when StatusBarIcon is also set | “lifepreserver” |
 | StatusBarIconNotifierEnabled | Boolean | false | Shows a small notification badge in the Status Bar Icon when an info items triggers a warning or notification | true |
+| HideMajorUpdates | Boolean | false | Ignore macOS major updates. This will prevent the menu bar icon and the macOS version info item from showing an available major update. Only applicable to macOS 12.3 and higher | true |
 | CustomColor | String | macOS Accent Color | Custom color for all symbols. Leave empty to use macOS Accent Color. We recommend not to use a very light color as text may become hard to read | HEX color in RGB format like "#8cc63f" |
 | CustomColorDarkMode | String | macOS Accent Color | Custom color for all symbols in Dark Mode. Leave empty to use macOS Accent Color or CustomColor if specified. We recommend not to use a very dark color as text may become hard to read | HEX color in RGB format like "#8cc63f" |
 | HideFirstRow | Boolean | false | Hides the first row of configurable items. | true |

src/Support/AppDelegate.swift

@@ -111,6 +111,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         defaults.addObserver(self, forKeyPath: "PasswordExpiryLimit", options: .new, context: nil)
         defaults.addObserver(self, forKeyPath: "OpenAtLogin", options: .new, context: nil)
         ASUdefaults?.addObserver(self, forKeyPath: "LastUpdatesAvailable", options: .new, context: nil)
+        ASUdefaults?.addObserver(self, forKeyPath: "RecommendedUpdates", options: .new, context: nil)
 
         // Receive notifications after uptime check
         NotificationCenter.default.addObserver(self, selector: #selector(setStatusBarIcon), name: Notification.Name.uptimeDaysLimit, object: nil)
@@ -231,17 +232,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             var updatesAvailable = computerinfo.updatesAvailable
 
             // If configured, ignore major macOS version updates
-            if preferences.deferMajorVersions {
+            if preferences.hideMajorUpdates {
+                logger.debug("HideMajorUpdates is enabled, hiding \(self.computerinfo.majorVersionUpdates) major macOS updates")
                 updatesAvailable -= computerinfo.majorVersionUpdates
             }
 
             // Show notification badge in menu bar icon when info item when needed
-            if (computerinfo.updatesAvailable == 0 || !infoItemsEnabled.contains("MacOSVersion")) && ((computerinfo.uptimeLimitReached && infoItemsEnabled.contains("Uptime")) || (computerinfo.selfSignedIP && infoItemsEnabled.contains("Network")) || (userinfo.passwordExpiryLimitReached && infoItemsEnabled.contains("Password")) || (computerinfo.storageLimitReached && infoItemsEnabled.contains("Storage"))) && defaults.bool(forKey: "StatusBarIconNotifierEnabled") {
+            if (updatesAvailable == 0 || !infoItemsEnabled.contains("MacOSVersion")) && ((computerinfo.uptimeLimitReached && infoItemsEnabled.contains("Uptime")) || (computerinfo.selfSignedIP && infoItemsEnabled.contains("Network")) || (userinfo.passwordExpiryLimitReached && infoItemsEnabled.contains("Password")) || (computerinfo.storageLimitReached && infoItemsEnabled.contains("Storage"))) && defaults.bool(forKey: "StatusBarIconNotifierEnabled") {
 
                 // Create orange notification badge
                 orangeBadge.isHidden = false
 
-            } else if (computerinfo.updatesAvailable > 0 && infoItemsEnabled.contains("MacOSVersion")) && defaults.bool(forKey: "StatusBarIconNotifierEnabled") {
+            } else if (updatesAvailable > 0 && infoItemsEnabled.contains("MacOSVersion")) && defaults.bool(forKey: "StatusBarIconNotifierEnabled") {
 
                 // Create red notification badge
                 redBadge.isHidden = false
@@ -298,7 +300,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 await self.userinfo.getCurrentUserRecord()
             }
         case "LastUpdatesAvailable":
-            logger.debug("\(keyPath! as NSObject) changed to \(self.ASUdefaults!.integer(forKey: "LastUpdatesAvailable"))")
+            logger.debug("\(keyPath! as NSObject, privacy: .public) changed to \(self.ASUdefaults!.integer(forKey: "LastUpdatesAvailable"))")
+        case "RecommendedUpdates":
+            logger.debug("\(keyPath! as NSObject, privacy: .public) changed, checking update contents...")
             self.computerinfo.getRecommendedUpdates()
         case "OpenAtLogin":
             logger.debug("\(keyPath! as NSObject) change to \(self.defaults.bool(forKey: "OpenAtLogin"))")
@@ -385,7 +389,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             self.computerinfo.kernelBootTime()
             self.computerinfo.getStorage()
             self.computerinfo.getIPAddress()
-            self.computerinfo.getRecommendedUpdates()
             Task {
                 await self.userinfo.getCurrentUserRecord()
             }

src/Support/ComputerInfo.swift

@@ -541,11 +541,14 @@ class ComputerInfo: ObservableObject {
 
     // MARK: - Get Array of RecommendedUpdates from com.apple.SoftwareUpdate
     func getRecommendedUpdates() {
+        logger.debug("Checking RecommendedUpdates for macOS updates and versions...")
 
         let userDefaultsSoftwareUpdates = UserDefaults(suiteName: "com.apple.SoftwareUpdate")
         let recommendedUpdates = userDefaultsSoftwareUpdates?.array(forKey: "RecommendedUpdates") ?? []
 
         var decodedItems: [SoftwareUpdateModel] = []
+        
+        // Reset major version updates to 0
         majorVersionUpdates = 0
 
         do {
@@ -555,21 +558,28 @@ class ComputerInfo: ObservableObject {
             // Decode JSON data
             let decoder = JSONDecoder()
             decodedItems = try decoder.decode([SoftwareUpdateModel].self, from: data)
+            logger.debug("Successfully decoded RecommendedUpdates...")
 
         } catch {
             logger.error("Error getting RecommendedUpdates...")
         }
 
+        logger.debug("\(decodedItems.count) updates found")
+        
         // Loop through all available updates and decrease number of updates when available macOS version is higher than current major version
         for item in decodedItems {
             if item.displayName.contains("macOS") {
                 if let version = item.displayVersion?.components(separatedBy: ".")[0] {
-                    logger.debug("macOS update found: macOS \(version, privacy: .public)")
+                    logger.debug("macOS update found: \(item.displayName, privacy: .public)")
                     if Int(version) ?? 0 > systemVersionMajor {
-                        logger.debug("macOS version \(version, privacy: .public) is higher than the current macOS version, update will be hidden")
+                        logger.debug("macOS version \(version, privacy: .public) is higher than the current macOS version, update will be hidden when DeferMajorVersions is enabled")
                         majorVersionUpdates += 1
                     }
+                } else {
+                    logger.error("Error getting macOS version from \(item.displayName)")
                 }
+            } else {
+                logger.debug("\(item.displayName) is not a macOS update")
             }
         }
     }

src/Support/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1671405102</string>
+	<string>1671578862</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/Support/Preferences.swift

@@ -41,8 +41,8 @@ class Preferences: ObservableObject {
     // Automatically register modern LaunchAgent on macOS 13 and higher
     @AppStorage("OpenAtLogin") var openAtLogin: Bool = false
 
-    // Defer major version updates for macOS
-    @AppStorage("DeferMajorVersions") var deferMajorVersions: Bool = false
+    // Hide major updates for macOS
+    @AppStorage("HideMajorUpdates") var hideMajorUpdates: Bool = false
 
     // MARK: - Info items
 

src/Support/Views/ButtonViews/MacOSVersionSubview.swift

@@ -34,7 +34,7 @@ struct MacOSVersionSubview: View {
 
     // Calculate number of updates to show
     var updatesAvailable: Int {
-        if preferences.deferMajorVersions {
+        if preferences.hideMajorUpdates {
             return computerinfo.updatesAvailable - computerinfo.majorVersionUpdates
         } else {
             return computerinfo.updatesAvailable