Fix enabledKeyboardInputSourcesChanged

pqrs-org · Jan 25, 2025 · b4a8a14 · b4a8a14
1 parent 98650f2
commit b4a8a14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/ShowyEdge/swift/Extensions/TISInputSource+Extensions.swift b/src/ShowyEdge/swift/Extensions/TISInputSource+Extensions.swift
@@ -13,4 +13,8 @@ extension TISInputSource {
   var inputModeID: String? {
     getProperty(kTISPropertyInputModeID) as? String
   }
+
+  var localizedName: String? {
+    getProperty(kTISPropertyLocalizedName) as? String
+  }
 }
diff --git a/src/ShowyEdge/swift/WorkspaceData.swift b/src/ShowyEdge/swift/WorkspaceData.swift
@@ -50,20 +50,17 @@ public class WorkspaceData: NSObject, ObservableObject {
   private func enabledKeyboardInputSourcesChanged() {
     Task { @MainActor in
       guard
-        let inputSourceList = TISCreateInputSourceList(nil, false)?.takeUnretainedValue()
+        let inputSourceList = TISCreateInputSourceList(nil, false)?.takeRetainedValue()
           as? [TISInputSource]
       else { return }
 
       var newInputSourceNames: [String: String] = [:]
 
       for inputSource in inputSourceList {
-        if let id = TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID),
-          let name = TISGetInputSourceProperty(inputSource, kTISPropertyLocalizedName)
+        if let id = inputSource.inputSourceID,
+          let name = inputSource.localizedName
         {
-          let inputSourceID = String(unsafeBitCast(id, to: CFString.self))
-          let localizedName = String(unsafeBitCast(name, to: CFString.self))
-
-          newInputSourceNames[inputSourceID] = localizedName
+          newInputSourceNames[id] = name
         }
       }