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
50c7236b
Commit
50c7236b
authored
1 year ago
by
Taras
Browse files
Options
Downloads
Patches
Plain Diff
Improve configure workspace filter
parent
c9d90643
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt
+2
-6
2 additions, 6 deletions
...ure/workspace/data_source/ConfigureWorkspaceDataSource.kt
with
2 additions
and
6 deletions
auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt
+
2
−
6
View file @
50c7236b
...
@@ -8,10 +8,9 @@ import org.futo.circles.core.model.CIRCLES_SPACE_ACCOUNT_DATA_KEY
...
@@ -8,10 +8,9 @@ import org.futo.circles.core.model.CIRCLES_SPACE_ACCOUNT_DATA_KEY
import
org.futo.circles.core.model.CirclesRoom
import
org.futo.circles.core.model.CirclesRoom
import
org.futo.circles.core.model.SharedCirclesSpace
import
org.futo.circles.core.model.SharedCirclesSpace
import
org.futo.circles.core.provider.MatrixSessionProvider
import
org.futo.circles.core.provider.MatrixSessionProvider
import
org.futo.circles.core.utils.getAllJoinedCirclesRoomsAndSpaces
import
org.futo.circles.core.utils.getJoinedRoomById
import
org.futo.circles.core.utils.getJoinedRoomById
import
org.matrix.android.sdk.api.session.room.Room
import
org.matrix.android.sdk.api.session.room.Room
import
org.matrix.android.sdk.api.session.room.model.Membership
import
org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
import
javax.inject.Inject
import
javax.inject.Inject
class
ConfigureWorkspaceDataSource
@Inject
constructor
(
class
ConfigureWorkspaceDataSource
@Inject
constructor
(
...
@@ -81,10 +80,7 @@ class ConfigureWorkspaceDataSource @Inject constructor(
...
@@ -81,10 +80,7 @@ class ConfigureWorkspaceDataSource @Inject constructor(
private
fun
getJoinedRoomIdByTag
(
tag
:
String
):
String
?
{
private
fun
getJoinedRoomIdByTag
(
tag
:
String
):
String
?
{
val
session
=
MatrixSessionProvider
.
currentSession
?:
return
null
val
session
=
MatrixSessionProvider
.
currentSession
?:
return
null
return
session
.
roomService
().
getRoomSummaries
(
roomSummaryQueryParams
{
return
getAllJoinedCirclesRoomsAndSpaces
(
session
).
firstOrNull
{
it
.
hasTag
(
tag
)
}
?.
roomId
excludeType
=
null
memberships
=
listOf
(
Membership
.
JOIN
)
}).
firstOrNull
{
it
.
hasTag
(
tag
)
}
?.
roomId
}
}
private
fun
getJoinedRoomIdFromAccountData
(
room
:
CirclesRoom
):
String
?
{
private
fun
getJoinedRoomIdFromAccountData
(
room
:
CirclesRoom
):
String
?
{
...
...
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