ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase usage of RoomAlias

Browse Source
This commit is contained in:
Benoit Marty
2024-04-16 12:27:26 +02:00
committed by Benoit Marty
parent ecd1bf76e2
commit 8327ea306f
24 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
+4 -3
View File
@@ -20,6 +20,7 @@ import android.os.Parcelable
import androidx.compose.runtime.Immutable
import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.matrix.api.core.RoomAlias
import io.element.android.libraries.matrix.api.core.RoomId
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@@ -29,7 +30,7 @@ import kotlinx.parcelize.Parcelize
data class RoomDescription(
val roomId: RoomId,
val name: String?,
val alias: String?,
val alias: RoomAlias?,
val topic: String?,
val avatarUrl: String?,
val joinRule: JoinRule,
@@ -42,14 +43,14 @@ data class RoomDescription(
}
@IgnoredOnParcel
val computedName = name ?: alias ?: roomId.value
val computedName = name ?: alias?.value ?: roomId.value
@IgnoredOnParcel
val computedDescription: String
get() {
return when {
topic != null -> topic
name != null && alias != null -> alias
name != null && alias != null -> alias.value
name == null && alias == null -> ""
else -> roomId.value
}