Fix manager in progress indicator

profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSRepository.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.hts.repository.HTSManager
@@ -29,8 +26,8 @@ class HTSRepository @Inject constructor(
     private val _data = MutableStateFlow<BleManagerResult<HTSData>>(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(HTSService::class.java, device)
@@ -55,16 +52,13 @@ class HTSRepository @Inject constructor(
                 .useAutoConnect(false)
                 .retry(3, 100)
                 .suspend()
-            _isRunning.value = true
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
     fun release() {
-        serviceManager.stopService(HTSService::class.java)
         manager?.disconnect()?.enqueue()
         manager = null
-        _isRunning.value = false
     }
 }

profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.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.hts.data.HTSRepository
 import no.nordicsemi.android.service.DEVICE_DATA
 import no.nordicsemi.android.service.NotificationService
@@ -22,6 +24,10 @@ internal class HTSService : NotificationService() {
 
         repository.start(device, lifecycleScope)
 
+        repository.hasBeenDisconnected.onEach {
+            if (it) stopSelf()
+        }.launchIn(lifecycleScope)
+
         return START_REDELIVER_INTENT
     }
 }

profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt

@@ -32,11 +32,11 @@ fun HTSScreen() {
             when (state.htsManagerState) {
                 NoDeviceState -> NoDeviceView()
                 is WorkingState -> when (state.htsManagerState.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 -> HTSContentView(state.htsManagerState.result.data, state.temperatureUnit) { viewModel.onEvent(it) }
                 }
             }.exhaustive

profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt

@@ -3,15 +3,12 @@ package no.nordicsemi.android.hts.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.hts.data.HTSRepository
 import no.nordicsemi.android.hts.repository.HTS_SERVICE_UUID
 import no.nordicsemi.android.hts.view.*
 import no.nordicsemi.android.navigation.*
-import no.nordicsemi.android.service.ServiceManager
 import no.nordicsemi.android.utils.exhaustive
 import no.nordicsemi.android.utils.getDevice
 import no.nordicsemi.ui.scanner.ScannerDestinationId
@@ -20,7 +17,6 @@ import javax.inject.Inject
 @HiltViewModel
 internal class HTSViewModel @Inject constructor(
     private val repository: HTSRepository,
-    private val serviceManager: ServiceManager,
     private val navigationManager: NavigationManager
 ) : ViewModel() {
 
@@ -28,8 +24,10 @@ internal class HTSViewModel @Inject constructor(
     val state = _state.asStateFlow()
 
     init {
-        if (!repository.isRunning.value) {
-            requestBluetoothDevice()
+        viewModelScope.launch {
+            if (repository.isRunning.firstOrNull() == false) {
+                requestBluetoothDevice()
+            }
         }
 
         repository.data.onEach {

profile_hts/src/main/res/values/strings.xml

@@ -7,5 +7,5 @@
     <string name="hts_kelvin">%.1f °K</string>
 
     <string name="hts_temperature">Temperature</string>
-    <string name="hts_records_section">Records</string>
+    <string name="hts_records_section">Data</string>
 </resources>