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
5145c858
Commit
5145c858
authored
1 year ago
by
Taras
Browse files
Options
Downloads
Patches
Plain Diff
Add migration for shared circles
parent
ea3964d7
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
+26
-9
26 additions, 9 deletions
...ure/workspace/data_source/ConfigureWorkspaceDataSource.kt
with
26 additions
and
9 deletions
auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt
+
26
−
9
View file @
5145c858
package
org.futo.circles.auth.feature.workspace.data_source
import
kotlinx.coroutines.delay
import
org.futo.circles.core.feature.room.create.CreateRoomDataSource
import
org.futo.circles.core.feature.room.RoomRelationsBuilder
import
org.futo.circles.core.feature.room.create.CreateRoomDataSource
import
org.futo.circles.core.feature.workspace.SpacesTreeAccountDataSource
import
org.futo.circles.core.model.CIRCLES_SPACE_ACCOUNT_DATA_KEY
import
org.futo.circles.core.model.CirclesRoom
import
org.futo.circles.core.model.SharedCirclesSpace
import
org.futo.circles.core.provider.MatrixSessionProvider
import
org.futo.circles.core.utils.getJoinedRoomById
import
org.matrix.android.sdk.api.session.room.Room
...
...
@@ -22,14 +24,17 @@ class ConfigureWorkspaceDataSource @Inject constructor(
var
roomId
=
addIdToAccountDataIfRoomExistWithTag
(
room
)
if
(
roomId
==
null
)
roomId
=
getJoinedRoomIdFromAccountData
(
room
)
if
(
roomId
==
null
)
createRoomWithAccountDataRecordIfNeed
(
room
)
else
{
try
{
getJoinedRoomById
(
roomId
)
?.
let
{
validateRelations
(
room
.
parentAccountDataKey
,
it
)
}
}
catch
(
_
:
Exception
)
{
val
parentRoomId
=
room
.
parentAccountDataKey
?.
let
{
spacesTreeAccountDataSource
.
getRoomIdByKey
(
it
)
}
parentRoomId
?.
let
{
roomRelationsBuilder
.
setRelations
(
roomId
,
parentRoomId
)
}
}
else
validateAndFixRelationInNeeded
(
roomId
,
room
)
}
private
suspend
fun
validateAndFixRelationInNeeded
(
roomId
:
String
,
room
:
CirclesRoom
)
{
try
{
getJoinedRoomById
(
roomId
)
?.
let
{
validateRelations
(
room
.
parentAccountDataKey
,
it
)
}
}
catch
(
_
:
Exception
)
{
val
parentRoomId
=
room
.
parentAccountDataKey
?.
let
{
spacesTreeAccountDataSource
.
getRoomIdByKey
(
it
)
}
parentRoomId
?.
let
{
roomRelationsBuilder
.
setRelations
(
roomId
,
parentRoomId
)
}
removeSharedCirclesToMyCirclesRelationIfNeeded
(
room
,
roomId
)
}
}
...
...
@@ -98,6 +103,18 @@ class ConfigureWorkspaceDataSource @Inject constructor(
return
roomId
}
//part of Shared Circles from My Circles to Root migration
private
suspend
fun
removeSharedCirclesToMyCirclesRelationIfNeeded
(
circlesRoom
:
CirclesRoom
,
roomId
:
String
)
{
if
(
circlesRoom
!
is
SharedCirclesSpace
)
return
val
myCirclesSpaceId
=
spacesTreeAccountDataSource
.
getRoomIdByKey
(
CIRCLES_SPACE_ACCOUNT_DATA_KEY
)
?:
return
roomRelationsBuilder
.
removeRelations
(
roomId
,
myCirclesSpaceId
)
}
private
companion
object
{
private
const
val
CREATE_ROOM_DELAY
=
1000L
}
...
...
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