@ledgerhq/device-transport-kit-react-native-hid 0.0.0-rn-hid-sync-onboarding-behavior-20250519170421 → 0.0.0-rn-hid-fixed-device-id-20250521081816

package/android/src/main/kotlin/com/ledger/devicesdk/shared/androidMain/transport/usb/DefaultAndroidUsbTransport.kt

@@ -274,12 +274,33 @@ internal class DefaultAndroidUsbTransport(
     }
 
     override suspend fun connect(discoveryDevice: DiscoveryDevice): InternalConnectionResult {
-        val usbDevice: UsbDevice? =
-            usbManager.deviceList.values.firstOrNull { it.deviceId == discoveryDevice.uid.toInt() }
+
+        loggerService.log(
+            buildSimpleDebugLogInfo(
+                "AndroidUsbTransport",
+                "[connect] discoveryDevice=$discoveryDevice"
+            )
+        )
+
+        val usbDevices = usbManager.deviceList.values
+
+        var usbDevice: UsbDevice? =
+            usbDevices.firstOrNull { it.deviceId == discoveryDevice.uid.toInt() }
+
+        if (usbDevice == null) {
+            // This is useful for LL during the OS update
+            loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] No device found with matching id, looking for device with matching model"))
+            usbDevice =
+                usbDevices.firstOrNull { it.toLedgerUsbDevice()?.ledgerDevice == discoveryDevice.ledgerDevice }
+        } else {
+            loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] Found device with matching id"))
+        }
 
         val ledgerUsbDevice = usbDevice?.toLedgerUsbDevice()
 
         return if (usbDevice == null || ledgerUsbDevice == null) {
+            loggerService.log(
+                buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] No device found"))
             InternalConnectionResult.ConnectionError(error = InternalConnectionResult.Failure.DeviceNotFound)
         } else {
             val permissionResult = checkOrRequestPermission(usbDevice)

package/android/src/main/kotlin/com/ledger/devicesdk/shared/androidMain/transport/usb/connection/AndroidUsbApduSender.kt

@@ -63,7 +63,6 @@ internal class AndroidUsbApduSender(
                     delay(abortTimeoutDuration)
                     usbConnection.releaseInterface(usbInterface)
                     usbConnection.close()
-                    cancel("Timeout")
                     throw SendApduTimeoutException
                 }
 

package/android/src/main/kotlin/com/ledger/devicesdk/shared/api/discovery/DiscoveryDevice.kt

@@ -8,7 +8,7 @@ package com.ledger.devicesdk.shared.api.discovery
 import com.ledger.devicesdk.shared.api.device.LedgerDevice
 import kotlinx.datetime.Clock
 
-public class DiscoveryDevice(
+public data class DiscoveryDevice(
     public val uid: String,
     public val name: String,
     public val ledgerDevice: LedgerDevice,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/device-transport-kit-react-native-hid",
-  "version": "0.0.0-rn-hid-sync-onboarding-behavior-20250519170421",
+  "version": "0.0.0-rn-hid-fixed-device-id-20250521081816",
   "license": "Apache-2.0",
   "private": false,
   "react-native": "src/index.ts",
@@ -35,17 +35,17 @@
     "@types/uuid": "^10.0.0",
     "react-native": "0.76.6",
     "rxjs": "^7.8.2",
-    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-sync-onboarding-behavior-20250519170421",
+    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-fixed-device-id-20250521081816",
     "@ledgerhq/eslint-config-dsdk": "0.0.2",
     "@ledgerhq/ldmk-tool": "0.0.1",
-    "@ledgerhq/vitest-config-dmk": "0.0.0",
     "@ledgerhq/prettier-config-dsdk": "0.0.2",
+    "@ledgerhq/vitest-config-dmk": "0.0.0",
     "@ledgerhq/tsconfig-dsdk": "1.0.1"
   },
   "peerDependencies": {
     "react-native": ">0.74.1",
     "rxjs": "^7.8.2",
-    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-sync-onboarding-behavior-20250519170421"
+    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-fixed-device-id-20250521081816"
   },
   "scripts": {
     "prebuild": "rimraf lib",