Skip to content

Commit

Permalink
Merge pull request #4230 from nextcloud/backport/4221/stable-20.0
Browse files Browse the repository at this point in the history
[stable-20.0] fix to show user status in conversation list
  • Loading branch information
mahibi authored Sep 17, 2024
2 parents 1e5df50 + c7e8ef2 commit 0fe3e84
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.nextcloud.talk.data.database.model.ConversationEntity
import com.nextcloud.talk.data.network.NetworkMonitor
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.models.domain.ConversationModel
import com.nextcloud.talk.utils.CapabilitiesUtil.isUserStatusAvailable
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
Expand Down Expand Up @@ -107,8 +108,10 @@ class OfflineFirstConversationsRepository @Inject constructor(
return null
}

val includeStatus = isUserStatusAvailable(user)

try {
val conversationsList = network.getRooms(user, user.baseUrl!!, false)
val conversationsList = network.getRooms(user, user.baseUrl!!, includeStatus)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.blockingSingle()
Expand Down

0 comments on commit 0fe3e84

Please sign in to comment.