[macOS] A couple of small bugfixes (#456)

* [macOS] A couple of small bugfixes * Update some deprecated names
qmk · Mar 6, 2024 · db96e80 · db96e80
1 parent c25f094
commit db96e80
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/macos/QMK Toolbox/Info.plist b/macos/QMK Toolbox/Info.plist
@@ -13,14 +13,16 @@
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Default</string>
 			<key>LSItemContentTypes</key>
 			<array>
 				<string>fm.qmk.hex</string>
 			</array>
 			<key>LSTypeIsPackage</key>
 			<integer>0</integer>
 			<key>NSDocumentClass</key>
-			<string>NSDocument</string>
+			<string></string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
@@ -29,14 +31,16 @@
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Default</string>
 			<key>LSItemContentTypes</key>
 			<array>
 				<string>com.apple.macbinary-archive</string>
 			</array>
 			<key>LSTypeIsPackage</key>
 			<integer>0</integer>
 			<key>NSDocumentClass</key>
-			<string>NSDocument</string>
+			<string></string>
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>

diff --git a/macos/QMK Toolbox/MainViewController.swift b/macos/QMK Toolbox/MainViewController.swift
@@ -1,4 +1,5 @@
 import Cocoa
+import UniformTypeIdentifiers
 
 class MainViewController: NSViewController, USBListenerDelegate {
     @IBOutlet var filepathBox: NSComboBox!
@@ -273,7 +274,10 @@ class MainViewController: NSViewController, USBListenerDelegate {
         openPanel.canChooseDirectories = false
         openPanel.allowsMultipleSelection = false
         openPanel.message = "Select firmware to load"
-        openPanel.allowedFileTypes = ["bin", "hex"]
+        openPanel.allowedContentTypes = [
+            UTType(filenameExtension: "bin")!,
+            UTType(filenameExtension: "hex")!
+        ]
         openPanel.beginSheetModal(for: window) { response in
             guard response == .OK, let file = openPanel.url else { return }
             self.setFilePath(file)

diff --git a/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift b/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift
@@ -124,7 +124,7 @@ class BootloaderDevice: USBDeviceProtocol, CustomStringConvertible {
         let serialMatcher = IOServiceMatching(kIOSerialBSDServiceValue)
         var serialIterator: io_iterator_t = 0
 
-        guard IOServiceGetMatchingServices(kIOMasterPortDefault, serialMatcher, &serialIterator) == KERN_SUCCESS else { return nil }
+        guard IOServiceGetMatchingServices(kIOMainPortDefault, serialMatcher, &serialIterator) == KERN_SUCCESS else { return nil }
 
         repeat {
             let port = IOIteratorNext(serialIterator)

diff --git a/macos/QMK Toolbox/USB/Bootloader/LUFAMSDevice.swift b/macos/QMK Toolbox/USB/Bootloader/LUFAMSDevice.swift
@@ -41,7 +41,7 @@ class LUFAMSDevice: BootloaderDevice {
         massStorageMatcher[kIOMediaRemovableKey] = true
 
         var massStorageIterator: io_iterator_t = 0
-        guard IOServiceGetMatchingServices(kIOMasterPortDefault, massStorageMatcher as CFDictionary, &massStorageIterator) == KERN_SUCCESS else { return nil }
+        guard IOServiceGetMatchingServices(kIOMainPortDefault, massStorageMatcher as CFDictionary, &massStorageIterator) == KERN_SUCCESS else { return nil }
 
         repeat {
             let media = IOIteratorNext(massStorageIterator)

diff --git a/macos/QMK Toolbox/USB/USBListener.swift b/macos/QMK Toolbox/USB/USBListener.swift
@@ -25,7 +25,7 @@ class USBListener: BootloaderDeviceDelegate {
     }
 
     func start() {
-        notificationPort = IONotificationPortCreate(kIOMasterPortDefault)
+        notificationPort = IONotificationPortCreate(kIOMainPortDefault)
         let runLoopSource = IONotificationPortGetRunLoopSource(notificationPort).takeUnretainedValue()
         CFRunLoopAddSource(RunLoop.current.getCFRunLoop(), runLoopSource, .defaultMode)