rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds isUpgraded method to VersioningState

Browse Source
This commit is contained in:
ericdecanini 2022-06-03 12:02:50 +02:00
parent 01b7395c04
commit f6b0e8d13c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6200.bugfix
View File

@ -1,2 +1 @@
Fixes room not being in space after upgrade Fixes room not being in space after upgrade

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
View File

@ -19,5 +19,7 @@ package org.matrix.android.sdk.api.session.room.model
enum class VersioningState { enum class VersioningState {
NONE, NONE,
UPGRADED_ROOM_NOT_JOINED, UPGRADED_ROOM_NOT_JOINED,
UPGRADED_ROOM_JOINED UPGRADED_ROOM_JOINED;
fun isUpgraded() = this != NONE
} }

3
vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
View File

@ -44,7 +44,6 @@ import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
import org.matrix.android.sdk.api.session.room.model.RoomType import org.matrix.android.sdk.api.session.room.model.RoomType
import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
import org.matrix.android.sdk.api.session.room.model.VersioningState
import org.matrix.android.sdk.api.util.toMatrixItem import org.matrix.android.sdk.api.util.toMatrixItem
import javax.inject.Inject import javax.inject.Inject
@ -213,5 +212,5 @@ class SpaceDirectoryController @Inject constructor(
} }
private fun SpaceChildInfo.isUpgradedRoom(data: SpaceDirectoryState) = private fun SpaceChildInfo.isUpgradedRoom(data: SpaceDirectoryState) =
data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState != VersioningState.NONE } data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState.isUpgraded() }
} }