Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
circles-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Circles
circles-android
Commits
a0ef1e31
Commit
a0ef1e31
authored
1 year ago
by
Taras
Browse files
Options
Downloads
Patches
Plain Diff
Fix shortcuts
parent
0937005e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/org/futo/circles/feature/notifications/ShortcutsHandler.kt
+4
-5
4 additions, 5 deletions
...rg/futo/circles/feature/notifications/ShortcutsHandler.kt
with
4 additions
and
5 deletions
app/src/main/java/org/futo/circles/feature/notifications/ShortcutsHandler.kt
+
4
−
5
View file @
a0ef1e31
...
...
@@ -12,8 +12,8 @@ import kotlinx.coroutines.flow.flowOn
import
kotlinx.coroutines.flow.launchIn
import
kotlinx.coroutines.flow.onEach
import
org.futo.circles.R
import
org.futo.circles.core.
provider.MatrixSessionProvider
import
org.
futo.circles.core.utils.getAllJoinedCirclesRoomsAndSpacesLiveData
import
org.futo.circles.core.
utils.getAllCirclesRoomsLiveData
import
org.
matrix.android.sdk.api.session.room.model.Membership
import
org.matrix.android.sdk.api.session.room.model.RoomSummary
import
javax.inject.Inject
...
...
@@ -29,9 +29,8 @@ class ShortcutsHandler @Inject constructor(
fun
observeRoomsAndBuildShortcuts
(
coroutineScope
:
CoroutineScope
):
Job
{
if
(
Build
.
VERSION
.
SDK_INT
<
Build
.
VERSION_CODES
.
N_MR1
)
return
Job
()
val
session
=
MatrixSessionProvider
.
currentSession
?:
return
Job
()
return
getAllJoinedCirclesRoomsAndSpacesLiveData
(
session
).
asFlow
().
onEach
{
rooms
->
return
getAllCirclesRoomsLiveData
(
listOf
(
Membership
.
JOIN
)).
asFlow
().
onEach
{
rooms
->
removeDeadShortcuts
(
rooms
.
map
{
it
.
roomId
})
createShortcuts
(
rooms
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment