mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-17 04:20:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

cleaning

Browse source
This commit is contained in:
Valere 2021-03-16 09:42:10 +01:00
parent 48fef45ce3
commit e364a36ee6
4 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
View file

@ -92,6 +92,7 @@ interface Room :
limit: Int, limit: Int,
beforeLimit: Int, beforeLimit: Int,
afterLimit: Int, afterLimit: Int,
// fun getSpaceParents(): List<SpaceSummary>
includeProfile: Boolean): SearchResult includeProfile: Boolean): SearchResult
fun asSpace(): Space?
} }

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
View file

@ -39,10 +39,6 @@ internal open class SpaceParentSummaryEntity(
var viaServers: RealmList<String> = RealmList() var viaServers: RealmList<String> = RealmList()
// var child: RoomSummaryEntity? = null,
// var level: Int = 0
) : RealmObject() { ) : RealmObject() {
companion object companion object

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
View file

@ -51,21 +51,14 @@ internal class DefaultSpaceService @Inject constructor(
@SessionDatabase private val monarchy: Monarchy, @SessionDatabase private val monarchy: Monarchy,
@UserId private val userId: String, @UserId private val userId: String,
private val createSpaceTask: CreateSpaceTask, private val createSpaceTask: CreateSpaceTask,
// private val joinRoomTask: JoinRoomTask,
private val joinSpaceTask: JoinSpaceTask, private val joinSpaceTask: JoinSpaceTask,
private val spaceGetter: SpaceGetter, private val spaceGetter: SpaceGetter,
// private val markAllRoomsReadTask: MarkAllRoomsReadTask,
// private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
// private val roomIdByAliasTask: GetRoomIdByAliasTask,
// private val deleteRoomAliasTask: DeleteRoomAliasTask,
private val roomGetter: RoomGetter, private val roomGetter: RoomGetter,
private val roomSummaryDataSource: RoomSummaryDataSource, private val roomSummaryDataSource: RoomSummaryDataSource,
private val stateEventDataSource: StateEventDataSource, private val stateEventDataSource: StateEventDataSource,
private val peekSpaceTask: PeekSpaceTask, private val peekSpaceTask: PeekSpaceTask,
private val resolveSpaceInfoTask: ResolveSpaceInfoTask, private val resolveSpaceInfoTask: ResolveSpaceInfoTask,
private val leaveRoomTask: LeaveRoomTask private val leaveRoomTask: LeaveRoomTask
// private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
// private val taskExecutor: TaskExecutor
) : SpaceService { ) : SpaceService {
override suspend fun createSpace(params: CreateSpaceParams): String { override suspend fun createSpace(params: CreateSpaceParams): String {

2
vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
View file

@ -148,7 +148,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
val roomSummary = session.getRoomSummary(roomId) val roomSummary = session.getRoomSummary(roomId)
val membership = roomSummary?.membership val membership = roomSummary?.membership
val eventId = permalinkData.eventId val eventId = permalinkData.eventId
val roomAlias = permalinkData.getRoomAliasOrNull() // val roomAlias = permalinkData.getRoomAliasOrNull()
val isSpace = roomSummary?.roomType == RoomType.SPACE val isSpace = roomSummary?.roomType == RoomType.SPACE
return when { return when {
membership == Membership.BAN -> context.toast(R.string.error_opening_banned_room) membership == Membership.BAN -> context.toast(R.string.error_opening_banned_room)