macOS: Fix HID crashing regression (#1267)

Use thread-safe calls for macOS HID Uses a custom snapshot of hid4java gary-rowe/hid4java#153 --------- Co-authored-by: Tres Finocchiaro <tres.finocchiaro@gmail.com>
qzind · Jul 23, 2024 · fb12d07 · fb12d07
1 parent 522fba3
commit fb12d07
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/lib/communication/hid4java-0.7.2-SNAPSHOT.jar b/lib/communication/hid4java-0.7.2-SNAPSHOT.jar
diff --git a/lib/communication/hid4java-0.8.0+7.jar b/lib/communication/hid4java-0.8.0+7.jar
diff --git a/src/qz/communication/H4J_HidUtilities.java b/src/qz/communication/H4J_HidUtilities.java
@@ -7,26 +7,16 @@
 import org.hid4java.HidDevice;
 import org.hid4java.HidManager;
 import org.hid4java.HidServices;
-import qz.utils.SystemUtilities;
 
 import javax.usb.util.UsbUtil;
 import java.util.HashSet;
 import java.util.List;
 
 public class H4J_HidUtilities {
-
-    private static HidServices service = HidManager.getHidServices();
-
+    private static final HidServices service = HidManager.getHidServices();
 
     public static List<HidDevice> getHidDevices() {
-        List<HidDevice> devices = service.getAttachedHidDevices();
-
-        // FIXME: Prevent hard crash on OSX
-        // Per upstream Mac bug https://github.com/gary-rowe/hid4java/issues/37
-        if (SystemUtilities.isMac()) {
-            service.shutdown();
-        }
-        return devices;
+        return service.getAttachedHidDevices();
     }
 
     public static JSONArray getHidDevicesJSON() throws JSONException {
@@ -72,5 +62,4 @@ public static HidDevice findDevice(DeviceOptions dOpts) {
 
         return null;
     }
-
 }