Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ble/src/main/java/no/nordicsemi/android/ble/Request.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ enum Type {
SLEEP,
}

protected RequestHandler requestHandler;
protected CallbackHandler handler;
RequestHandler requestHandler;
CallbackHandler handler;

final ConditionVariable syncLock;
final Type type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import no.nordicsemi.android.ble.ktx.state.ConnectionState
import no.nordicsemi.android.ble.ktx.stateAsFlow
import no.nordicsemi.android.ble.trivia.client.data.ClientViewState
import no.nordicsemi.android.ble.trivia.client.repository.ClientConnection
import no.nordicsemi.android.ble.trivia.client.repository.ScannerRepository
import no.nordicsemi.android.ble.trivia.server.viewmodel.Timer
import no.nordicsemi.android.ble.trivia.server.viewmodel.TimerViewModel
import no.nordicsemi.android.ble.ktx.stateAsFlow
import javax.inject.Inject

@HiltViewModel
Expand Down Expand Up @@ -47,7 +46,7 @@ class ClientViewModel @Inject constructor(
error
.onEach { _clientState.value = _clientState.value.copy(nameResult = it) }
.launchIn(viewModelScope)
userJoined
userJoined
.onEach { _clientState.value = _clientState.value.copy(userJoined = it) }
.launchIn(viewModelScope)
question
Expand Down