rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Init room in constructor.

Browse Source
This commit is contained in:
Onuray Sahin 2020-09-30 10:58:32 +03:00 committed by Benoit Marty
parent 4dbeaeb465
commit d4a0659483
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
View File

@ -29,6 +29,7 @@ import im.vector.app.core.extensions.exhaustive
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.room.Room
import org.matrix.android.sdk.api.session.search.SearchResult import org.matrix.android.sdk.api.session.search.SearchResult
import org.matrix.android.sdk.internal.util.awaitCallback import org.matrix.android.sdk.internal.util.awaitCallback
@ -37,6 +38,12 @@ class SearchViewModel @AssistedInject constructor(
private val session: Session private val session: Session
) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) { ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
private var room: Room? = null
init {
room = initialState.roomId?.let { session.getRoom(it) }
}
@AssistedInject.Factory @AssistedInject.Factory
interface Factory { interface Factory {
fun create(initialState: SearchViewState): SearchViewModel fun create(initialState: SearchViewState): SearchViewModel
@ -94,9 +101,7 @@ class SearchViewModel @AssistedInject constructor(
viewModelScope.launch { viewModelScope.launch {
try { try {
val result = awaitCallback<SearchResult> { val result = awaitCallback<SearchResult> {
session room?.search(
.getRoom(state.roomId)
?.search(
searchTerm = state.searchTerm, searchTerm = state.searchTerm,
nextBatch = state.searchResult?.nextBatch, nextBatch = state.searchResult?.nextBatch,
orderByRecent = true, orderByRecent = true,