From c5b808cd4f58f04cb01335fe7eecfd69453c17ce Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Wed, 26 Apr 2023 12:44:28 +0200 Subject: [PATCH] Revert "Clear repository when enter a screen" This reverts commit 9354dd0b44fd0266c03b343039f139afe5be6657. --- .../android/cgms/repository/CGMRepository.kt | 10 ++++------ .../nordicsemi/android/cgms/repository/CGMService.kt | 2 +- .../nordicsemi/android/cgms/viewmodel/CGMViewModel.kt | 4 +--- .../nordicsemi/android/csc/repository/CSCRepository.kt | 9 +++------ .../nordicsemi/android/csc/viewmodel/CSCViewModel.kt | 4 +--- .../no/nordicsemi/android/hrs/service/HRSRepository.kt | 7 ++----- .../nordicsemi/android/hrs/viewmodel/HRSViewModel.kt | 4 +--- .../nordicsemi/android/hts/repository/HTSRepository.kt | 7 ++----- .../nordicsemi/android/hts/viewmodel/HTSViewModel.kt | 4 +--- .../nordicsemi/android/prx/repository/PRXRepository.kt | 7 ++----- .../no/nordicsemi/android/prx/repository/PRXService.kt | 2 +- .../nordicsemi/android/prx/viewmodel/PRXViewModel.kt | 4 +--- .../android/rscs/repository/RSCSRepository.kt | 7 ++----- .../nordicsemi/android/rscs/viewmodel/RSCSViewModel.kt | 4 +--- .../android/uart/repository/UARTRepository.kt | 7 ++----- .../nordicsemi/android/uart/viewmodel/UARTViewModel.kt | 4 +--- 16 files changed, 26 insertions(+), 60 deletions(-) diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt index 043cf604..24d76fb3 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt @@ -32,6 +32,7 @@ package no.nordicsemi.android.cgms.repository import android.content.Context +import android.util.Log import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asSharedFlow @@ -105,15 +106,12 @@ class CGMRepository @Inject constructor( _data.value = _data.value.copy(deviceName = device.name) } - fun clearRecords() { + fun clear() { _data.value = _data.value.copy(records = emptyList()) } - fun stop() { + fun release() { + _data.value = CGMServiceData() _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _data.value = CGMServiceData() - } } diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt index 47f38a94..6f5658b5 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt @@ -286,7 +286,7 @@ internal class CGMService : NotificationService() { } private fun clear() { - repository.clearRecords() + repository.clear() } private suspend fun requestLastRecord() { diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/viewmodel/CGMViewModel.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/viewmodel/CGMViewModel.kt index 330bd397..abe520d8 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/viewmodel/CGMViewModel.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/viewmodel/CGMViewModel.kt @@ -67,8 +67,6 @@ internal class CGMViewModel @Inject constructor( val state = repository.data init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -115,6 +113,6 @@ internal class CGMViewModel @Inject constructor( } private fun disconnect() { - repository.stop() + repository.release() } } diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt index 979305a6..0f009ec8 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt @@ -38,6 +38,7 @@ import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import no.nordicsemi.android.common.core.simpleSharedFlow +import no.nordicsemi.android.common.logger.NordicBlekLogger import no.nordicsemi.android.csc.data.CSCServiceData import no.nordicsemi.android.csc.data.SpeedUnit import no.nordicsemi.android.kotlin.ble.core.ServerDevice @@ -104,12 +105,8 @@ class CSCRepository @Inject constructor( _loggerEvent.tryEmit(OpenLoggerEvent()) } - fun stop() { + fun release() { + _data.value = CSCServiceData() _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _wheelSize.value = WheelSizes.default - _data.value = CSCServiceData() - } } diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt index e1817e12..47e61ed5 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt @@ -68,8 +68,6 @@ internal class CSCViewModel @Inject constructor( val state = repository.data init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -117,7 +115,7 @@ internal class CSCViewModel @Inject constructor( } private fun disconnect() { - repository.stop() + repository.release() navigationManager.navigateUp() } } diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt index a2aa271d..4de965a0 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt @@ -101,11 +101,8 @@ class HRSRepository @Inject constructor( _loggerEvent.tryEmit(OpenLoggerEvent()) } - fun stop() { + fun release() { + _data.value = HRSServiceData() _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _data.value = HRSServiceData() - } } diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/viewmodel/HRSViewModel.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/viewmodel/HRSViewModel.kt index 44310e26..3168334b 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/viewmodel/HRSViewModel.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/viewmodel/HRSViewModel.kt @@ -66,8 +66,6 @@ internal class HRSViewModel @Inject constructor( val state = repository.data init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -114,7 +112,7 @@ internal class HRSViewModel @Inject constructor( } private fun disconnect() { - repository.stop() + repository.release() navigationManager.navigateUp() } } diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt index 27d0f47d..d3cf7635 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt @@ -98,12 +98,9 @@ class HTSRepository @Inject constructor( _loggerEvent.tryEmit(OpenLoggerEvent()) } - fun stop() { + fun release() { logger = null + _data.value = HTSServiceData() _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _data.value = HTSServiceData() - } } diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt index 03bf9d87..8d28b961 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt @@ -66,8 +66,6 @@ internal class HTSViewModel @Inject constructor( val state = repository.data init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -110,7 +108,7 @@ internal class HTSViewModel @Inject constructor( } private fun disconnect() { - repository.stop() + repository.release() navigationManager.navigateUp() } diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt index 96577ca2..183a53af 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt @@ -106,12 +106,9 @@ class PRXRepository @Inject internal constructor( _loggerEvent.tryEmit(OpenLoggerEvent()) } - fun stop() { + fun release() { + _data.value = PRXServiceData() _remoteAlarmLevel.tryEmit(AlarmLevel.NONE) _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _data.value = PRXServiceData() - } } diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt index 416c5af3..7d137bef 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt @@ -213,7 +213,7 @@ internal class PRXService : NotificationService() { private fun stopIfDisconnected(connectionState: GattConnectionState, connectionStatus: BleGattConnectionStatus) { if (connectionState == GattConnectionState.STATE_DISCONNECTED && !connectionStatus.isLinkLoss) { server.stopServer() - repository.stop() + repository.release() stopSelf() } } diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt index 42c5e551..53e86ce7 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt @@ -72,8 +72,6 @@ internal class PRXViewModel @Inject constructor( val state = repository.data init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -125,7 +123,7 @@ internal class PRXViewModel @Inject constructor( private fun disconnect() { alarmHandler.pauseAlarm() navigationManager.navigateUp() - repository.stop() + repository.release() } override fun onCleared() { diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt index 4db977d4..10bc3004 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt @@ -93,12 +93,9 @@ class RSCSRepository @Inject constructor( _loggerEvent.tryEmit(OpenLoggerEvent()) } - fun stop() { + fun release() { logger = null + _data.value = RSCSServiceData() _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _data.value = RSCSServiceData() - } } diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/viewmodel/RSCSViewModel.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/viewmodel/RSCSViewModel.kt index 9b0faf5f..57d912ac 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/viewmodel/RSCSViewModel.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/viewmodel/RSCSViewModel.kt @@ -65,8 +65,6 @@ internal class RSCSViewModel @Inject constructor( val state = repository.data init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -108,7 +106,7 @@ internal class RSCSViewModel @Inject constructor( } private fun disconnect() { - repository.stop() + repository.release() navigationManager.navigateUp() } } diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt index 316faafc..abcba7a8 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt @@ -124,11 +124,8 @@ class UARTRepository @Inject internal constructor( configurationDataSource.saveConfigurationName(name) } - fun stop() { + fun release() { + _data.value = UARTServiceData() _stopEvent.tryEmit(DisconnectAndStopEvent()) } - - fun clear() { - _data.value = UARTServiceData() - } } diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/viewmodel/UARTViewModel.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/viewmodel/UARTViewModel.kt index cf05630e..30e79922 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/viewmodel/UARTViewModel.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/viewmodel/UARTViewModel.kt @@ -91,8 +91,6 @@ internal class UARTViewModel @Inject constructor( val state = _state.asStateFlow() init { - repository.clear() - viewModelScope.launch { if (repository.isRunning.firstOrNull() == false) { requestBluetoothDevice() @@ -235,7 +233,7 @@ internal class UARTViewModel @Inject constructor( } private fun disconnect() { - repository.stop() + repository.release() navigationManager.navigateUp() } }