fix: reconnect ble on home resume

Author: ovitrif

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

@@ -87,6 +87,8 @@ class HwWalletRepo @Inject constructor(
     /** Forwards UI-delivered transport events, e.g. the USB attach intent from the OS app picker. */
     fun onTransportRestored(transportType: TransportType) = trezorRepo.onTransportRestored(transportType)
 
+    fun onAppForegrounded() = trezorRepo.onAppForegrounded()
+
     suspend fun resetState() = withContext(ioDispatcher) {
         activeWatchers.toList().forEach { watcherId ->
             trezorRepo.stopWatcher(watcherId)

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

@@ -752,6 +752,17 @@ class TrezorRepo @Inject constructor(
      */
     fun onTransportRestored(transportType: TransportType) = launchTransportReconnect(transportType)
 
+    fun onAppForegrounded() {
+        scope.launch {
+            if (_state.value.connected != null || isConnectInProgress()) return@launch
+            val knownDevices = _state.value.knownDevices.ifEmpty { loadKnownDevices() }
+            if (knownDevices.none { it.transportType == TransportType.BLUETOOTH }) return@launch
+
+            Logger.info("Attempting bluetooth auto-reconnect after app foregrounded", context = TAG)
+            launchTransportReconnect(TransportType.BLUETOOTH)
+        }
+    }
+
     /**
      * Serializes reconnect triggers into one in-flight retry loop. A Trezor
      * re-enumerates USB during its unlock flow, so a single replug delivers several

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

@@ -244,7 +244,7 @@ fun HomeScreen(
     DisposableEffect(lifecycle) {
         val observer = LifecycleEventObserver { _, event ->
             when (event) {
-                Lifecycle.Event.ON_RESUME -> appViewModel.checkTimedSheets()
+                Lifecycle.Event.ON_RESUME -> appViewModel.onHomeResumed()
                 Lifecycle.Event.ON_PAUSE -> appViewModel.onLeftHome()
                 else -> Unit
             }

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -3186,6 +3186,11 @@ class AppViewModel @Inject constructor(
 
     fun checkTimedSheets() = timedSheetManager.onHomeScreenEntered()
 
+    fun onHomeResumed() {
+        checkTimedSheets()
+        hwWalletRepo.onAppForegrounded()
+    }
+
     fun onLeftHome() = timedSheetManager.onHomeScreenExited()
 
     fun dismissTimedSheet() = timedSheetManager.dismissCurrentSheet()

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

@@ -591,6 +591,15 @@ class HwWalletRepoTest : BaseUnitTest() {
         verify(trezorRepo).onTransportRestored(TransportType.USB)
     }
 
+    @Test
+    fun `forwards app foregrounded to the trezor repo`() = test {
+        val sut = createRepo()
+
+        sut.onAppForegrounded()
+
+        verify(trezorRepo).onAppForegrounded()
+    }
+
     @Test
     fun `forwards pairing code calls to the trezor repo`() = test {
         val sut = createRepo()

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

@@ -9,6 +9,7 @@ import com.synonym.bitkitcore.TrezorPublicKeyResponse
 import com.synonym.bitkitcore.TrezorSignedMessageResponse
 import com.synonym.bitkitcore.TrezorTransportType
 import com.synonym.bitkitcore.WalletSelection
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.advanceUntilIdle
@@ -41,7 +42,7 @@ import kotlin.test.assertTrue
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 
-@OptIn(ExperimentalTime::class)
+@OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class)
 @Suppress("LargeClass")
 class TrezorRepoTest : BaseUnitTest() {
 
@@ -355,6 +356,39 @@ class TrezorRepoTest : BaseUnitTest() {
         assertNotNull(sut.state.value.connected)
     }
 
+    @Test
+    fun `app foreground auto-reconnects to a known bluetooth device`() = test {
+        val features = mockFeatures()
+        val device = mockDeviceInfo(
+            transportType = TrezorTransportType.BLUETOOTH,
+            path = "ble-path",
+        )
+        whenever(hwWalletStore.loadKnownDevices()).thenReturn(
+            listOf(mockKnownDevice(transportType = TransportType.BLUETOOTH))
+        )
+        whenever(trezorService.isConnected()).thenReturn(false)
+        whenever(trezorService.scan()).thenReturn(listOf(device))
+        whenever(trezorService.connect(eq(DEVICE_ID), any(), eq(false))).thenReturn(features)
+        sut = createSut()
+
+        sut.onAppForegrounded()
+        advanceUntilIdle()
+
+        assertNotNull(sut.state.value.connected)
+        verify(trezorService).connect(eq(DEVICE_ID), any(), eq(false))
+    }
+
+    @Test
+    fun `app foreground skips reconnect without a known bluetooth device`() = test {
+        whenever(hwWalletStore.loadKnownDevices()).thenReturn(listOf(mockKnownDevice()))
+        sut = createSut()
+
+        sut.onAppForegrounded()
+        advanceUntilIdle()
+
+        verify(trezorService, never()).scan()
+    }
+
     @Test
     fun `onTransportRestored skips usb device without permission`() = test {
         val device = mockDeviceInfo()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -263,6 +263,13 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
         verify(hwWalletRepo).onTransportRestored(TransportType.USB)
     }
 
+    @Test
+    fun `onHomeResumed forwards app foreground to the hardware wallet repo`() = test {
+        sut.onHomeResumed()
+
+        verify(hwWalletRepo).onAppForegrounded()
+    }
+
     @Test
     fun `hardware received tx details navigate directly to hardware activity`() = test {
         val txId = "hardware-tx"