fix: surface hw connect failures

ovitrif · ovitrif · commit f3e3e6a07493 · 2026-06-19T22:11:54.000+02:00
diff --git a/app/src/main/java/to/bitkit/services/TrezorTransport.kt b/app/src/main/java/to/bitkit/services/TrezorTransport.kt
@@ -40,6 +40,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import to.bitkit.ext.bluetoothManager
 import to.bitkit.ext.usbManager
 import to.bitkit.models.TransportType
@@ -205,6 +207,7 @@ class TrezorTransport @Inject constructor(
 
     private val bleConnections = ConcurrentHashMap<String, BleConnection>()
     private val discoveredBleDevices = ConcurrentHashMap<String, BluetoothDevice>()
+    private val optionScopeMutex = Mutex()
 
     private data class UsbOpenDevice(
         val connection: UsbDeviceConnection,
@@ -225,20 +228,26 @@ class TrezorTransport @Inject constructor(
         @Volatile var writeStatus: Int = BluetoothGatt.GATT_SUCCESS,
     )
 
-    suspend fun <T> withUsbPermissionRequestsEnabled(enabled: Boolean, block: suspend () -> T): T {
+    suspend fun <T> withUsbPermissionRequestsEnabled(
+        enabled: Boolean,
+        block: suspend () -> T,
+    ): T = optionScopeMutex.withLock {
         val previous = requestUsbPermissionEnabled
         requestUsbPermissionEnabled = enabled
-        return try {
+        try {
             block()
         } finally {
             requestUsbPermissionEnabled = previous
         }
     }
 
-    suspend fun <T> withBluetoothScanningEnabled(enabled: Boolean, block: suspend () -> T): T {
+    suspend fun <T> withBluetoothScanningEnabled(
+        enabled: Boolean,
+        block: suspend () -> T,
+    ): T = optionScopeMutex.withLock {
         val previous = bluetoothScanningEnabled
         bluetoothScanningEnabled = enabled
-        return try {
+        try {
             block()
         } finally {
             bluetoothScanningEnabled = previous
diff --git a/app/src/main/java/to/bitkit/ui/sheets/hardware/HardwareSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/hardware/HardwareSheet.kt
@@ -88,7 +88,11 @@ fun HardwareSheet(
         }
     }
     val blePermissions = rememberMultiplePermissionsState(bluetoothPermissions) { results ->
-        if (results.values.all { it }) enableBleScanning()
+        if (results.values.all { it }) {
+            enableBleScanning()
+        } else {
+            showBlePermissionDialog = true
+        }
     }
     val requestBleAccess: () -> Unit = {
         when {
@@ -135,7 +139,10 @@ fun HardwareSheet(
                 )
             }
             composableWithDefaultTransitions<HardwareRoute.Searching> {
-                HwSearchingSheet(onCancel = appViewModel::hideSheet)
+                HwSearchingSheet(
+                    errorMessage = uiState.errorMessage,
+                    onCancel = appViewModel::hideSheet,
+                )
             }
             composableWithDefaultTransitions<HardwareRoute.Found> { backStackEntry ->
                 val route = backStackEntry.toRoute<HardwareRoute.Found>()
@@ -151,6 +158,7 @@ fun HardwareSheet(
                 HwFoundSheet(
                     deviceModel = deviceModel,
                     isConnecting = uiState.isConnecting,
+                    errorMessage = uiState.errorMessage,
                     onConnect = { viewModel.onConnectClick(route.deviceId) },
                     onCancel = appViewModel::hideSheet,
                 )
@@ -199,7 +207,12 @@ private fun ConnectEffectHandler(
         viewModel.effects.collect { effect ->
             when (effect) {
                 HwConnectEffect.NavigateToSearching -> navController.navigateTo(HardwareRoute.Searching)
-                HwConnectEffect.NavigateToFound -> navController.navigateTo(HardwareRoute.Found())
+                is HwConnectEffect.NavigateToFound -> navController.navigateTo(
+                    HardwareRoute.Found(
+                        deviceId = effect.deviceId,
+                        deviceModel = effect.deviceModel,
+                    ),
+                )
                 HwConnectEffect.NavigateToPairCode -> navController.navigateTo(HardwareRoute.PairCode)
                 HwConnectEffect.NavigateToPaired -> navController.navigateTo(HardwareRoute.Paired)
                 HwConnectEffect.Dismiss -> appViewModel.hideSheet()
diff --git a/app/src/main/java/to/bitkit/ui/sheets/hardware/HwConnectViewModel.kt b/app/src/main/java/to/bitkit/ui/sheets/hardware/HwConnectViewModel.kt
@@ -1,10 +1,12 @@
 package to.bitkit.ui.sheets.hardware
 
+import android.content.Context
 import androidx.compose.runtime.Immutable
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.synonym.bitkitcore.TrezorFeatures
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -14,6 +16,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import to.bitkit.R
 import to.bitkit.repositories.HwWalletRepo
 import to.bitkit.repositories.HwWalletRepo.Companion.DEVICE_LABEL_MAX_LENGTH
 import to.bitkit.repositories.resolveHwWalletName
@@ -30,6 +33,7 @@ import kotlin.time.Duration.Companion.seconds
 @HiltViewModel
 class HwConnectViewModel @Inject constructor(
     private val hwWalletRepo: HwWalletRepo,
+    @ApplicationContext private val context: Context,
 ) : ViewModel() {
     companion object {
         /** Delay between scan attempts while searching for a nearby device. */
@@ -54,6 +58,7 @@ class HwConnectViewModel @Inject constructor(
 
     fun onIntroContinue(includeBluetooth: Boolean = true) {
         includeBluetoothInScan = includeBluetooth
+        _uiState.update { it.copy(errorMessage = null) }
         setEffect(HwConnectEffect.NavigateToSearching)
         startSearching()
     }
@@ -71,6 +76,7 @@ class HwConnectViewModel @Inject constructor(
                 isSearching = false,
                 foundDeviceId = deviceId,
                 deviceModel = deviceModel.ifBlank { resolveHwWalletName(label = null, model = null) },
+                errorMessage = null,
             )
         }
         scanUsbBeforeConnect = true
@@ -81,14 +87,21 @@ class HwConnectViewModel @Inject constructor(
         val deviceId = deviceIdOverride ?: state.foundDeviceId ?: return
         val shouldScanUsbBeforeConnect = scanUsbBeforeConnect
         searchJob?.cancel()
-        _uiState.update { it.copy(isConnecting = true) }
+        _uiState.update { it.copy(isConnecting = true, errorMessage = null) }
         viewModelScope.launch {
             if (shouldScanUsbBeforeConnect) {
                 hwWalletRepo.scan(includeBluetooth = false)
             }
             hwWalletRepo.connect(deviceId)
                 .onSuccess { onConnected(deviceId, it) }
-                .onFailure { _uiState.update { state -> state.copy(isConnecting = false) } }
+                .onFailure {
+                    _uiState.update { state ->
+                        state.copy(
+                            isConnecting = false,
+                            errorMessage = context.getString(R.string.hardware__connect_error),
+                        )
+                    }
+                }
         }
     }
 
@@ -118,20 +131,30 @@ class HwConnectViewModel @Inject constructor(
     private fun startSearching() {
         if (searchJob?.isActive == true) return
         scanUsbBeforeConnect = false
-        _uiState.update { it.copy(isSearching = true) }
+        _uiState.update { it.copy(isSearching = true, errorMessage = null) }
         searchJob = viewModelScope.launch {
             while (isActive) {
-                hwWalletRepo.scan(includeBluetooth = includeBluetoothInScan)
+                val scanResult = hwWalletRepo.scan(includeBluetooth = includeBluetoothInScan)
+                if (scanResult.isFailure) {
+                    _uiState.update {
+                        it.copy(errorMessage = context.getString(R.string.hardware__search_error))
+                    }
+                    delay(SCAN_INTERVAL)
+                    continue
+                }
+                _uiState.update { it.copy(errorMessage = null) }
                 val device = hwWalletRepo.deviceState.value.nearbyDevices.firstOrNull()
                 if (device != null) {
+                    val deviceModel = resolveHwWalletName(label = null, model = device.model)
                     _uiState.update {
                         it.copy(
                             isSearching = false,
                             foundDeviceId = device.id,
-                            deviceModel = resolveHwWalletName(label = null, model = device.model),
+                            deviceModel = deviceModel,
+                            errorMessage = null,
                         )
                     }
-                    setEffect(HwConnectEffect.NavigateToFound)
+                    setEffect(HwConnectEffect.NavigateToFound(device.id, deviceModel))
                     return@launch
                 }
                 delay(SCAN_INTERVAL)
@@ -147,6 +170,7 @@ class HwConnectViewModel @Inject constructor(
                 pairedDeviceId = deviceId,
                 deviceName = name,
                 labelInput = if (labelInitialized) it.labelInput else name,
+                errorMessage = null,
             )
         }
         labelInitialized = true
@@ -191,11 +215,12 @@ data class HwConnectUiState(
     val deviceModel: String = "",
     val balanceSats: ULong = 0uL,
     val labelInput: String = "",
+    val errorMessage: String? = null,
 )
 
 sealed interface HwConnectEffect {
     data object NavigateToSearching : HwConnectEffect
-    data object NavigateToFound : HwConnectEffect
+    data class NavigateToFound(val deviceId: String, val deviceModel: String) : HwConnectEffect
     data object NavigateToPairCode : HwConnectEffect
     data object NavigateToPaired : HwConnectEffect
     data object Dismiss : HwConnectEffect
diff --git a/app/src/main/java/to/bitkit/ui/sheets/hardware/HwFoundSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/hardware/HwFoundSheet.kt
@@ -1,5 +1,6 @@
 package to.bitkit.ui.sheets.hardware
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -20,6 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
 import to.bitkit.ui.components.BodyM
+import to.bitkit.ui.components.BodyS
 import to.bitkit.ui.components.BottomSheetPreview
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
@@ -37,12 +39,14 @@ fun HwFoundSheet(
     deviceModel: String,
     modifier: Modifier = Modifier,
     isConnecting: Boolean = false,
+    errorMessage: String? = null,
     onConnect: () -> Unit = {},
     onCancel: () -> Unit = {},
 ) {
     Content(
         deviceModel = deviceModel,
         isConnecting = isConnecting,
+        errorMessage = errorMessage,
         onConnect = onConnect,
         onCancel = onCancel,
         modifier = modifier
@@ -54,6 +58,7 @@ private fun Content(
     deviceModel: String,
     modifier: Modifier = Modifier,
     isConnecting: Boolean = false,
+    errorMessage: String? = null,
     onConnect: () -> Unit = {},
     onCancel: () -> Unit = {},
 ) {
@@ -73,6 +78,16 @@ private fun Content(
             Display(stringResource(R.string.hardware__found_header).withAccent(accentColor = Colors.Blue))
             VerticalSpacer(8.dp)
             BodyM(stringResource(R.string.hardware__found_text, deviceModel), color = Colors.White64)
+            AnimatedVisibility(visible = errorMessage != null) {
+                Column {
+                    VerticalSpacer(16.dp)
+                    BodyS(
+                        text = errorMessage.orEmpty(),
+                        color = Colors.Red,
+                        modifier = Modifier.testTag("HwFoundError")
+                    )
+                }
+            }
         }
         Box(
             contentAlignment = Alignment.Center,
diff --git a/app/src/main/java/to/bitkit/ui/sheets/hardware/HwSearchingSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/hardware/HwSearchingSheet.kt
@@ -1,5 +1,6 @@
 package to.bitkit.ui.sheets.hardware
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.InfiniteTransition
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateFloat
@@ -26,6 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
 import to.bitkit.ui.components.BodyM
+import to.bitkit.ui.components.BodyS
 import to.bitkit.ui.components.BottomSheetPreview
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.SecondaryButton
@@ -55,9 +57,11 @@ private const val RING_SPIN_MS = 2000
 @Composable
 fun HwSearchingSheet(
     modifier: Modifier = Modifier,
+    errorMessage: String? = null,
     onCancel: () -> Unit = {},
 ) {
     Content(
+        errorMessage = errorMessage,
         onCancel = onCancel,
         modifier = modifier
     )
@@ -66,6 +70,7 @@ fun HwSearchingSheet(
 @Composable
 private fun Content(
     modifier: Modifier = Modifier,
+    errorMessage: String? = null,
     onCancel: () -> Unit = {},
 ) {
     Column(
@@ -84,6 +89,16 @@ private fun Content(
             Display(stringResource(R.string.hardware__connect_header).withAccent(accentColor = Colors.Blue))
             VerticalSpacer(8.dp)
             BodyM(stringResource(R.string.hardware__connect_text), color = Colors.White64)
+            AnimatedVisibility(visible = errorMessage != null) {
+                Column {
+                    VerticalSpacer(16.dp)
+                    BodyS(
+                        text = errorMessage.orEmpty(),
+                        color = Colors.Red,
+                        modifier = Modifier.testTag("HwSearchingError")
+                    )
+                }
+            }
         }
         Box(
             contentAlignment = Alignment.Center,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -167,6 +167,7 @@
     <string name="hardware__bluetooth_permission_settings">Open Settings</string>
     <string name="hardware__bluetooth_permission_text">Bitkit needs the nearby-devices (Bluetooth) permission to find your hardware wallet. Enable it in Settings, then try again.</string>
     <string name="hardware__bluetooth_permission_title">Bluetooth access needed</string>
+    <string name="hardware__connect_error">Could not connect to your Trezor. Check that it is unlocked and try again.</string>
     <string name="hardware__connect_header">Searching for &lt;accent&gt;devices&lt;/accent&gt;</string>
     <string name="hardware__connect_text">Please connect your hardware wallet now via USB or Bluetooth.</string>
     <string name="hardware__connect_title">Connect Device</string>
@@ -192,6 +193,7 @@
     <string name="hardware__remove_dialog_text">Don\'t worry, your funds are safe and your coins won\'t be deleted. Bitkit will simply stop displaying the amounts in the wallet.</string>
     <string name="hardware__remove_dialog_title">Remove %1$s</string>
     <string name="hardware__remove_error">Could not remove the hardware wallet. Please try again.</string>
+    <string name="hardware__search_error">Could not search for hardware wallets. Check your connection and try again.</string>
     <string name="lightning__availability__text">Funds transfer to savings is usually instant, but settlement may take up to &lt;accent&gt;14 days&lt;/accent&gt; under certain network conditions.</string>
     <string name="lightning__availability__title">Funds\n&lt;accent&gt;availability&lt;/accent&gt;</string>
     <string name="lightning__balance">Balance</string>
diff --git a/app/src/test/java/to/bitkit/ui/sheets/hardware/HwConnectViewModelTest.kt b/app/src/test/java/to/bitkit/ui/sheets/hardware/HwConnectViewModelTest.kt
