mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
Merge pull request #4221 from nextcloud/bugfix/4219/fixToShowUserStatus
fix to show user status in conversation list
This commit is contained in:
commit
951c073db1
@ -19,6 +19,7 @@ import com.nextcloud.talk.data.database.model.ConversationEntity
|
|||||||
import com.nextcloud.talk.data.network.NetworkMonitor
|
import com.nextcloud.talk.data.network.NetworkMonitor
|
||||||
import com.nextcloud.talk.data.user.model.User
|
import com.nextcloud.talk.data.user.model.User
|
||||||
import com.nextcloud.talk.models.domain.ConversationModel
|
import com.nextcloud.talk.models.domain.ConversationModel
|
||||||
|
import com.nextcloud.talk.utils.CapabilitiesUtil.isUserStatusAvailable
|
||||||
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
|
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
|
||||||
import io.reactivex.Observer
|
import io.reactivex.Observer
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
@ -107,8 +108,10 @@ class OfflineFirstConversationsRepository @Inject constructor(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val includeStatus = isUserStatusAvailable(user)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
val conversationsList = network.getRooms(user, user.baseUrl!!, false)
|
val conversationsList = network.getRooms(user, user.baseUrl!!, includeStatus)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.blockingSingle()
|
.blockingSingle()
|
||||||
|
Loading…
Reference in New Issue
Block a user