From 8d3167cb669e973f7668e918ca254cb4d45fb0ee Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 21 May 2021 11:42:01 +0200 Subject: [PATCH] Code review --- .../src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt | 2 +- .../app/features/spaces/explore/SpaceDirectoryController.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt index cf84ecf848..deb279eb95 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt @@ -159,4 +159,4 @@ fun RoomMemberSummary.toMatrixItem() = MatrixItem.UserItem(userId, displayName, fun SenderInfo.toMatrixItem() = MatrixItem.UserItem(userId, disambiguatedDisplayName, avatarUrl) -fun SpaceChildInfo.toMatrixItem() = MatrixItem.RoomItem(childRoomId, name ?: canonicalAlias ?: aliases?.firstOrNull(), avatarUrl) +fun SpaceChildInfo.toMatrixItem() = MatrixItem.RoomItem(childRoomId, name ?: canonicalAlias ?: "", avatarUrl) diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt index aade0ffd22..d2e1161f11 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt @@ -108,7 +108,7 @@ class SpaceDirectoryController @Inject constructor( val isLoading = data?.changeMembershipStates?.get(info.childRoomId)?.isInProgress() ?: false spaceChildInfoItem { id(info.childRoomId) - matrixItem(MatrixItem.RoomItem(info.childRoomId, info.name, info.avatarUrl)) + matrixItem(info.toMatrixItem()) avatarRenderer(host.avatarRenderer) topic(info.topic) memberCount(info.activeMemberCount ?: 0)