diff --git a/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
index ea2f6f4efbecebe453c55095fe484bda1c021529..c563754a068a311f3ecd035c53e81ee166d6c58c 100644
--- a/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
@@ -6,9 +6,11 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.withContext
import org.futo.circles.core.mapping.toRoomInfo
+import org.futo.circles.core.model.CIRCLES_SPACE_ACCOUNT_DATA_KEY
import org.futo.circles.core.model.TIMELINE_TYPE
import org.futo.circles.core.provider.MatrixSessionProvider
import org.futo.circles.core.utils.UserUtils
+import org.futo.circles.core.utils.getJoinedRoomById
import org.futo.circles.core.utils.getTimelineRoomFor
import org.futo.circles.core.workspace.SharedCircleDataSource
import org.futo.circles.core.workspace.SpacesTreeAccountDataSource
@@ -20,7 +22,6 @@ import org.futo.circles.model.RequestCircleListItem
import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
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.RoomType
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
import javax.inject.Inject
@@ -62,15 +63,14 @@ class CirclesDataSource @Inject constructor(
return displayList
}
- fun isJoinedCircle(summary: RoomSummary): Boolean =
- summary.roomType == RoomType.SPACE && summary.membership == Membership.JOIN
-// if(summary.roomId == sharedCircleDataSource.getSharedCirclesSpaceId()) return false
-// val circlesSpaceId = spacesTreeAccountDataSource.getRoomIdByKey(
-// CIRCLES_SPACE_ACCOUNT_DATA_KEY
-// ) ?: return false
-// return getJoinedRoomById(circlesSpaceId)?.roomSummary()?.spaceChildren?.map { it.childRoomId }
-// ?.contains(summary.roomId) == true
-// }
+ fun isJoinedCircle(summary: RoomSummary): Boolean {
+ if (summary.roomId == sharedCircleDataSource.getSharedCirclesSpaceId()) return false
+ val circlesSpaceId = spacesTreeAccountDataSource.getRoomIdByKey(
+ CIRCLES_SPACE_ACCOUNT_DATA_KEY
+ ) ?: return false
+ return getJoinedRoomById(circlesSpaceId)?.roomSummary()?.spaceChildren?.map { it.childRoomId }
+ ?.contains(summary.roomId) == true
+ }
private fun isInviteToCircleTimeline(summary: RoomSummary) =
summary.roomType == TIMELINE_TYPE && summary.membership == Membership.INVITE
diff --git a/app/src/main/java/org/futo/circles/feature/home/HomeViewModel.kt b/app/src/main/java/org/futo/circles/feature/home/HomeViewModel.kt
index 85d06b15d473165754e1e65ac705685e371283ce..a8fcde94838226bdd1158789548dc31a4f8951aa 100644
--- a/app/src/main/java/org/futo/circles/feature/home/HomeViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/home/HomeViewModel.kt
@@ -52,7 +52,6 @@ class HomeViewModel @Inject constructor(
return@launchBg
}
}
- workspaceDataSource.check()
validateWorkspaceResultLiveData.postValue(Response.Success(Unit))
}
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/workspace/ConfigureWorkspaceViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/workspace/ConfigureWorkspaceViewModel.kt
index 0dd6b028af4d8c3df67eb852ac9efb700b191729..5725dc656df6a57c59580c3771ae1d2ca9e3c5f8 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/workspace/ConfigureWorkspaceViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/workspace/ConfigureWorkspaceViewModel.kt
@@ -51,7 +51,6 @@ class ConfigureWorkspaceViewModel @Inject constructor(
is Response.Success -> updateTaskStatus(i, TaskStatus.SUCCESS)
}
}
- workspaceDataSource.check()
validateWorkspaceResultLiveData.postValue(
if (hasError) Response.Error("") else Response.Success(Unit)
)
@@ -74,7 +73,6 @@ class ConfigureWorkspaceViewModel @Inject constructor(
is Response.Success -> updateTaskStatus(i, TaskStatus.SUCCESS)
}
}
- workspaceDataSource.check()
workspaceResultLiveData.postValue(Response.Success(Unit))
}
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt
index 874cf6b290dcae30e6f41d80abc0be56927bf559..8c8d1f2b423d70be568d297200ad74bb58becc05 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/workspace/data_source/ConfigureWorkspaceDataSource.kt
@@ -1,14 +1,7 @@
package org.futo.circles.auth.feature.workspace.data_source
-import android.util.Log
import kotlinx.coroutines.delay
-import org.futo.circles.core.model.CIRCLES_SPACE_ACCOUNT_DATA_KEY
import org.futo.circles.core.model.CirclesRoom
-import org.futo.circles.core.model.GROUPS_SPACE_ACCOUNT_DATA_KEY
-import org.futo.circles.core.model.PEOPLE_SPACE_ACCOUNT_DATA_KEY
-import org.futo.circles.core.model.PHOTOS_SPACE_ACCOUNT_DATA_KEY
-import org.futo.circles.core.model.PROFILE_SPACE_ACCOUNT_DATA_KEY
-import org.futo.circles.core.model.ROOT_SPACE_ACCOUNT_DATA_KEY
import org.futo.circles.core.provider.MatrixSessionProvider
import org.futo.circles.core.room.CreateRoomDataSource
import org.futo.circles.core.room.RoomRelationsBuilder
@@ -105,101 +98,6 @@ class ConfigureWorkspaceDataSource @Inject constructor(
return roomId
}
- fun check() {
- val rootId =
- spacesTreeAccountDataSource.getRoomIdByKey(ROOT_SPACE_ACCOUNT_DATA_KEY) ?: ""
- val rootRoom = getJoinedRoomById(rootId)?.roomSummary()
- Log.d("MyLog", "1 - ${rootRoom?.name} - ${rootRoom?.membership} - ${rootRoom?.roomId}")
- Log.d(
- "MyLog",
- "parent - ${rootRoom?.spaceParents?.map { "${it.roomSummary?.name} - ${it.parentId}\n" }}"
- )
- Log.d(
- "MyLog",
- "children - ${rootRoom?.spaceChildren?.map { "${it.name} - ${it.childRoomId}\n" }}"
- )
-
- val circlesId =
- spacesTreeAccountDataSource.getRoomIdByKey(CIRCLES_SPACE_ACCOUNT_DATA_KEY) ?: ""
- val circlesRoom = getJoinedRoomById(circlesId)?.roomSummary()
- Log.d(
- "MyLog",
- "2 - ${circlesRoom?.name} - ${circlesRoom?.membership} - ${circlesRoom?.roomId}"
- )
- Log.d(
- "MyLog",
- "parent - ${circlesRoom?.spaceParents?.map { "${it.roomSummary?.name} - ${it.parentId}\n" }}"
- )
- Log.d(
- "MyLog",
- "children - ${circlesRoom?.spaceChildren?.map { "${it.name} - ${it.childRoomId}\n" }}"
- )
-
- val groupId =
- spacesTreeAccountDataSource.getRoomIdByKey(GROUPS_SPACE_ACCOUNT_DATA_KEY) ?: ""
- val groupRoom = getJoinedRoomById(groupId)?.roomSummary()
- Log.d(
- "MyLog",
- "2 - ${groupRoom?.name} - ${groupRoom?.membership} - ${groupRoom?.roomId}"
- )
- Log.d(
- "MyLog",
- "parent - ${groupRoom?.spaceParents?.map { "${it.roomSummary?.name} - ${it.parentId}\n" }}"
- )
- Log.d(
- "MyLog",
- "children - ${groupRoom?.spaceChildren?.map { "${it.name} - ${it.childRoomId}\n" }}"
- )
-
- val photosId =
- spacesTreeAccountDataSource.getRoomIdByKey(PHOTOS_SPACE_ACCOUNT_DATA_KEY) ?: ""
- val photosRoom = getJoinedRoomById(photosId)?.roomSummary()
- Log.d(
- "MyLog",
- "2 - ${photosRoom?.name} - ${photosRoom?.membership} - ${photosRoom?.roomId}"
- )
- Log.d(
- "MyLog",
- "parent - ${photosRoom?.spaceParents?.map { "${it.roomSummary?.name} - ${it.parentId}\n" }}"
- )
- Log.d(
- "MyLog",
- "children - ${photosRoom?.spaceChildren?.map { "${it.name} - ${it.childRoomId}\n" }}"
- )
-
- val peopleId =
- spacesTreeAccountDataSource.getRoomIdByKey(PEOPLE_SPACE_ACCOUNT_DATA_KEY) ?: ""
- val peopleRoom = getJoinedRoomById(peopleId)?.roomSummary()
- Log.d(
- "MyLog",
- "2 - ${peopleRoom?.name} - ${peopleRoom?.membership} - ${peopleRoom?.roomId}"
- )
- Log.d(
- "MyLog",
- "parent - ${peopleRoom?.spaceParents?.map { "${it.roomSummary?.name} - ${it.parentId}\n" }}"
- )
- Log.d(
- "MyLog",
- "children - ${peopleRoom?.spaceChildren?.map { "${it.name} - ${it.childRoomId}\n" }}"
- )
-
- val profileId =
- spacesTreeAccountDataSource.getRoomIdByKey(PROFILE_SPACE_ACCOUNT_DATA_KEY) ?: ""
- val profileRoom = getJoinedRoomById(profileId)?.roomSummary()
- Log.d(
- "MyLog",
- "3 - ${profileRoom?.name} - ${profileRoom?.membership} - ${profileRoom?.roomId}"
- )
- Log.d(
- "MyLog",
- "parent - ${profileRoom?.spaceParents?.map { "${it.roomSummary?.name} - ${it.parentId}\n" }}"
- )
- Log.d(
- "MyLog",
- "children - ${profileRoom?.spaceChildren?.map { "${it.name} - ${it.childRoomId}\n" }}"
- )
- }
-
private companion object {
private const val CREATE_ROOM_DELAY = 1000L
}