aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-02-03 13:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed auto reconnection after disconnect

Browse Source
This commit is contained in:
hiar
2025-08-27 10:43:31 +02:00
committed by Himali Aryal
parent 80d0bee84e
commit be76c39c72
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
profile/src/main/java/no/nordicsemi/android/toolbox/profile/viewmodel/ProfileViewModel.kt
View File

@@ -10,8 +10,6 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import no.nordicsemi.android.analytics.AppAnalytics
@@ -27,6 +25,7 @@ import no.nordicsemi.android.service.profile.ServiceApi
import no.nordicsemi.android.toolbox.profile.ProfileDestinationId
import no.nordicsemi.android.toolbox.profile.R
import no.nordicsemi.android.toolbox.profile.repository.DeviceRepository
import no.nordicsemi.kotlin.ble.client.android.Peripheral
import timber.log.Timber
import javax.inject.Inject
@@ -40,6 +39,7 @@ internal class ProfileViewModel @Inject constructor(
savedStateHandle: SavedStateHandle,
) : SimpleNavigationViewModel(navigator, savedStateHandle) {
val address: String = parameterOf(ProfileDestinationId)
var peripheral: Peripheral? = null
private var serviceApi: ServiceApi? = null
private val logger: nRFLoggerTree =
nRFLoggerTree(context, address, context.getString(R.string.app_name))
@@ -55,10 +55,13 @@ internal class ProfileViewModel @Inject constructor(
}
private suspend fun getServiceApi() =
profileServiceManager.bindService().also { serviceApi = it }
profileServiceManager.bindService().also {
serviceApi = it
peripheral = it.getPeripheral(address)
}
private fun observeConnectedDevices() = viewModelScope.launch {
// Bind the service and get the API
// Combine flows from the service to create a single UI state.
val api = getServiceApi()
// Combine flows from the service to create a single UI state.
@@ -113,15 +116,12 @@ internal class ProfileViewModel @Inject constructor(
*/
private fun connectToPeripheral() = viewModelScope.launch {
// Connect to the peripheral
getServiceApi().devices.onEach {
if (it[address]?.connectionState?.isConnected != true) {
Timber.tag("AAA PVM").d("Not connected to $address, connecting...")
getServiceApi().let {
if (it.getPeripheral(address) == null) peripheral = it.getPeripheral(address)
if (peripheral?.isConnected != true) {
profileServiceManager.connectToPeripheral(address)
return@onEach
} else {
Timber.tag("AAA PVM").d("Already connected to $address")
}
}.launchIn(viewModelScope)
}
}