fix: skip auto-reconnect during live hw handshake

Author: ovitrif

app/src/main/java/to/bitkit/repositories/TrezorRepo.kt

@@ -486,6 +486,12 @@ class TrezorRepo @Inject constructor(
     fun hasKnownDevices(): Boolean = _state.value.knownDevices.isNotEmpty()
 
     suspend fun autoReconnect(walletIndex: Int = 0): Result<TrezorFeatures> = withContext(ioDispatcher) {
+        if (isConnectInProgress()) {
+            // A live handshake looks like a stale session (transport connected,
+            // features pending), so resetting here would drop the session the
+            // user is entering their PIN or pairing code into.
+            return@withContext Result.failure(AppError("Connect already in progress"))
+        }
         val knownDevices = _state.value.knownDevices.ifEmpty { loadKnownDevices() }
         if (knownDevices.isEmpty()) {
             return@withContext Result.failure(AppError("No known devices"))
@@ -689,14 +695,23 @@ class TrezorRepo @Inject constructor(
      */
     private suspend fun retryAutoReconnect() {
         repeat(TRANSPORT_RESTORED_MAX_ATTEMPTS) { attempt ->
-            val current = _state.value
-            if (current.connected != null || current.isConnecting || current.isAutoReconnecting) return
+            if (_state.value.connected != null || isConnectInProgress()) return
             delay(TRANSPORT_RESTORED_RECONNECT_DELAY * (attempt + 1))
+            // A connect may have started while this attempt was waiting.
+            if (_state.value.connected != null || isConnectInProgress()) return
             Logger.info("Attempting auto-reconnect after transport restored, attempt '${attempt + 1}'", context = TAG)
             if (autoReconnect().isSuccess) return
         }
     }
 
+    private fun isConnectInProgress(): Boolean = run {
+        val current = _state.value
+        current.isConnecting ||
+            current.isAutoReconnecting ||
+            needsPinEntry.value ||
+            needsPairingCode.value
+    }
+
     private suspend fun addOrUpdateKnownDevice(deviceInfo: TrezorDeviceInfo, features: TrezorFeatures) {
         val existing = _state.value.knownDevices
         val previous = existing.find { it.id == deviceInfo.id }

app/src/test/java/to/bitkit/repositories/TrezorRepoTest.kt

@@ -21,6 +21,7 @@ import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
@@ -249,6 +250,34 @@ class TrezorRepoTest : BaseUnitTest() {
         verify(trezorService, times(2)).scan()
     }
 
+    @Test
+    fun `autoReconnect bails while device awaits pin entry`() = test {
+        whenever(trezorUiHandler.needsPinEntry).thenReturn(MutableStateFlow(true))
+        whenever(hwWalletStore.loadKnownDevices()).thenReturn(listOf(mockKnownDevice()))
+        sut = createSut()
+
+        val result = sut.autoReconnect()
+
+        assertTrue(result.isFailure)
+        verify(trezorService, never()).disconnect()
+        verify(trezorService, never()).scan()
+    }
+
+    @Test
+    fun `transport restored skips reconnect while device awaits pairing code`() = test {
+        val transportRestored = MutableSharedFlow<Unit>()
+        whenever(trezorTransport.transportRestored).thenReturn(transportRestored)
+        whenever(trezorTransport.needsPairingCode).thenReturn(MutableStateFlow(true))
+        whenever(hwWalletStore.loadKnownDevices()).thenReturn(listOf(mockKnownDevice()))
+        sut = createSut()
+
+        transportRestored.emit(Unit)
+        advanceUntilIdle()
+
+        verify(trezorService, never()).disconnect()
+        verify(trezorService, never()).scan()
+    }
+
     @Test
     fun `onTransportRestored auto-reconnects to a known device`() = test {
         val features = mockFeatures()