fix(react-native-usb): close all opened devices without exception

trezor · Aug 23, 2024 · a057422 · a057422
1 parent dd6281c
commit a057422
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/react-native-usb/android/src/main/java/io/trezor/rnusb/ReactNativeUsbModule.kt b/packages/react-native-usb/android/src/main/java/io/trezor/rnusb/ReactNativeUsbModule.kt
@@ -234,15 +234,17 @@ class ReactNativeUsbModule : Module() {
 
     private fun closeDevice(deviceName: String) {
         Log.d(LOG_TAG, "Closing device $deviceName")
-        val usbConnection = getOpenedConnection(deviceName)
-        usbConnection.close()
+        getOpenedConnection(deviceName).close()
         openedConnections.remove(deviceName)
     }
 
     private fun closeAllOpenedDevices() {
         Log.d(LOG_TAG, "Closing all devices")
-        openedConnections.forEach { (deviceName, _) ->
-            closeDevice(deviceName)
+        with(openedConnections.iterator()) {
+            forEach {
+                it.value.close()
+                remove()
+            }
         }
     }