Skip to content

Commit b923e37

Browse files
authored
Merge pull request #590
Warnigns fixed
2 parents b17b9cb + 006ffa0 commit b923e37

File tree

2 files changed

+4
-5
lines changed
  • ble/src/main/java/no/nordicsemi/android/ble
  • examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/client/viewmodel

2 files changed

+4
-5
lines changed

ble/src/main/java/no/nordicsemi/android/ble/Request.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ enum Type {
100100
SLEEP,
101101
}
102102

103-
protected RequestHandler requestHandler;
104-
protected CallbackHandler handler;
103+
RequestHandler requestHandler;
104+
CallbackHandler handler;
105105

106106
final ConditionVariable syncLock;
107107
final Type type;

examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/client/viewmodel/ClientViewModel.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ import kotlinx.coroutines.flow.asStateFlow
1212
import kotlinx.coroutines.flow.launchIn
1313
import kotlinx.coroutines.flow.onEach
1414
import kotlinx.coroutines.launch
15-
import no.nordicsemi.android.ble.ktx.state.ConnectionState
15+
import no.nordicsemi.android.ble.ktx.stateAsFlow
1616
import no.nordicsemi.android.ble.trivia.client.data.ClientViewState
1717
import no.nordicsemi.android.ble.trivia.client.repository.ClientConnection
1818
import no.nordicsemi.android.ble.trivia.client.repository.ScannerRepository
1919
import no.nordicsemi.android.ble.trivia.server.viewmodel.Timer
2020
import no.nordicsemi.android.ble.trivia.server.viewmodel.TimerViewModel
21-
import no.nordicsemi.android.ble.ktx.stateAsFlow
2221
import javax.inject.Inject
2322

2423
@HiltViewModel
@@ -47,7 +46,7 @@ class ClientViewModel @Inject constructor(
4746
error
4847
.onEach { _clientState.value = _clientState.value.copy(nameResult = it) }
4948
.launchIn(viewModelScope)
50-
userJoined
49+
userJoined
5150
.onEach { _clientState.value = _clientState.value.copy(userJoined = it) }
5251
.launchIn(viewModelScope)
5352
question

0 commit comments

Comments
 (0)