Skip to content
Snippets Groups Projects
Commit a0ef1e31 authored by Taras's avatar Taras
Browse files

Fix shortcuts

parent 0937005e
No related branches found
No related tags found
No related merge requests found
...@@ -12,8 +12,8 @@ import kotlinx.coroutines.flow.flowOn ...@@ -12,8 +12,8 @@ import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import org.futo.circles.R import org.futo.circles.R
import org.futo.circles.core.provider.MatrixSessionProvider import org.futo.circles.core.utils.getAllCirclesRoomsLiveData
import org.futo.circles.core.utils.getAllJoinedCirclesRoomsAndSpacesLiveData import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomSummary import org.matrix.android.sdk.api.session.room.model.RoomSummary
import javax.inject.Inject import javax.inject.Inject
...@@ -29,9 +29,8 @@ class ShortcutsHandler @Inject constructor( ...@@ -29,9 +29,8 @@ class ShortcutsHandler @Inject constructor(
fun observeRoomsAndBuildShortcuts(coroutineScope: CoroutineScope): Job { fun observeRoomsAndBuildShortcuts(coroutineScope: CoroutineScope): Job {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return Job() if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return Job()
val session = MatrixSessionProvider.currentSession ?: return Job() return getAllCirclesRoomsLiveData(listOf(Membership.JOIN)).asFlow().onEach { rooms ->
return getAllJoinedCirclesRoomsAndSpacesLiveData(session).asFlow().onEach { rooms ->
removeDeadShortcuts(rooms.map { it.roomId }) removeDeadShortcuts(rooms.map { it.roomId })
createShortcuts(rooms) createShortcuts(rooms)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment