Fix manager in progress indicator

profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTRepository.kt

@@ -4,10 +4,7 @@ import android.bluetooth.BluetoothDevice
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import no.nordicsemi.android.ble.ktx.suspend
 import no.nordicsemi.android.service.BleManagerResult
@@ -29,8 +26,8 @@ class UARTRepository @Inject constructor(
     private val _data = MutableStateFlow<BleManagerResult<UARTData>>(ConnectingResult())
     internal val data = _data.asStateFlow()
 
-    private val _isRunning = MutableStateFlow(false)
-    val isRunning = _isRunning.asStateFlow()
+    val isRunning = data.map { it.isRunning() }
+    val hasBeenDisconnected = data.map { it.hasBeenDisconnected() }
 
     fun launch(device: BluetoothDevice) {
         serviceManager.startService(UARTService::class.java, device)
@@ -59,16 +56,13 @@ class UARTRepository @Inject constructor(
                 .useAutoConnect(false)
                 .retry(3, 100)
                 .suspend()
-            _isRunning.value = true
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
     fun release() {
-        serviceManager.stopService(UARTService::class.java)
         manager?.disconnect()?.enqueue()
         manager = null
-        _isRunning.value = false
     }
 }

profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTManager.kt

@@ -41,7 +41,7 @@ import no.nordicsemi.android.utils.EMPTY
 import no.nordicsemi.android.utils.launchWithCatch
 import java.util.*
 
-val UART_SERVICE_UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
+val UART_SERVICE_UUID: UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
 private val UART_RX_CHARACTERISTIC_UUID = UUID.fromString("6E400002-B5A3-F393-E0A9-E50E24DCCA9E")
 private val UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E")
 
@@ -116,7 +116,7 @@ internal class UARTManager(
             gatt.getService(BATTERY_SERVICE_UUID)?.run {
                 batteryLevelCharacteristic = getCharacteristic(BATTERY_LEVEL_CHARACTERISTIC_UUID)
             }
-            return rxCharacteristic != null && txCharacteristic != null && batteryLevelCharacteristic != null && (writeRequest || writeCommand)
+            return rxCharacteristic != null && txCharacteristic != null && (writeRequest || writeCommand)
         }
 
         override fun onServicesInvalidated() {

profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt

@@ -4,6 +4,8 @@ import android.bluetooth.BluetoothDevice
 import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import no.nordicsemi.android.service.DEVICE_DATA
 import no.nordicsemi.android.service.NotificationService
 import no.nordicsemi.android.uart.data.UARTRepository
@@ -22,6 +24,10 @@ internal class UARTService : NotificationService() {
 
         repository.start(device, lifecycleScope)
 
+        repository.hasBeenDisconnected.onEach {
+            if (it) stopSelf()
+        }.launchIn(lifecycleScope)
+
         return START_REDELIVER_INTENT
     }
 }

profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt

@@ -26,20 +26,17 @@ fun UARTScreen() {
     Column {
         val navigateUp = { viewModel.onEvent(NavigateUp) }
 
-        BackIconAppBar(stringResource(id = R.string.uart_title)) {
-            viewModel.onEvent(DisconnectEvent)
-        }
+        BackIconAppBar(stringResource(id = R.string.uart_title), navigateUp)
 
         Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
             when (state.uartManagerState) {
                 NoDeviceState -> NoDeviceView()
                 is WorkingState -> when (state.uartManagerState.result) {
-                    is ConnectingResult,
-                    is ReadyResult
-                    -> DeviceConnectingView { viewModel.onEvent(DisconnectEvent) }
+                    is ConnectingResult -> DeviceConnectingView { viewModel.onEvent(DisconnectEvent) }
                     is DisconnectedResult -> DeviceDisconnectedView(Reason.USER, navigateUp)
                     is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS, navigateUp)
                     is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE, navigateUp)
+                    is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN, navigateUp)
                     is SuccessResult -> UARTContentView(state.uartManagerState.result.data, state.macros) { viewModel.onEvent(it) }
                 }
             }.exhaustive

profile_uart/src/main/java/no/nordicsemi/android/uart/viewmodel/UARTViewModel.kt

@@ -3,10 +3,8 @@ package no.nordicsemi.android.uart.viewmodel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
 import no.nordicsemi.android.navigation.*
 import no.nordicsemi.android.uart.data.UARTMacro
 import no.nordicsemi.android.uart.data.UARTRepository
@@ -27,8 +25,10 @@ internal class UARTViewModel @Inject constructor(
     val state = _state.asStateFlow()
 
     init {
-        if (!repository.isRunning.value) {
-            requestBluetoothDevice()
+        viewModelScope.launch {
+            if (repository.isRunning.firstOrNull() == false) {
+                requestBluetoothDevice()
+            }
         }
 
         repository.data.onEach {