Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
Benoit Marty 2022-12-22 18:28:44 +01:00
parent a9ac218a36
commit 3d9ba211a3
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
View file

@ -65,6 +65,11 @@ class MatrixRoom(
return slidingSyncRoom.name() return slidingSyncRoom.name()
} }
val bestName: String
get() {
return name?.takeIf { it.isNotEmpty() } ?: room.id()
}
val displayName: String val displayName: String
get() { get() {
return room.displayName() return room.displayName()

2
libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/MatrixItemHelper.kt
View file

@ -55,7 +55,7 @@ class MatrixItemHelper(
suspend fun loadAvatarData(room: MatrixRoom, size: AvatarSize): AvatarData { suspend fun loadAvatarData(room: MatrixRoom, size: AvatarSize): AvatarData {
return loadAvatarData( return loadAvatarData(
name = room.name ?: room.roomId.value, name = room.bestName,
url = room.avatarUrl, url = room.avatarUrl,
size = size size = size
) )

2
libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaFetcher.kt
View file

@ -24,7 +24,7 @@ import io.element.android.x.matrix.MatrixClient
import io.element.android.x.matrix.media.MediaResolver import io.element.android.x.matrix.media.MediaResolver
import java.nio.ByteBuffer import java.nio.ByteBuffer
class MediaFetcher( internal class MediaFetcher(
private val mediaResolver: MediaResolver?, private val mediaResolver: MediaResolver?,
private val meta: MediaResolver.Meta, private val meta: MediaResolver.Meta,
private val options: Options, private val options: Options,

2
libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaKeyer.kt
View file

@ -20,7 +20,7 @@ import coil.key.Keyer
import coil.request.Options import coil.request.Options
import io.element.android.x.matrix.media.MediaResolver import io.element.android.x.matrix.media.MediaResolver
class MediaKeyer : Keyer<MediaResolver.Meta> { internal class MediaKeyer : Keyer<MediaResolver.Meta> {
override fun key(data: MediaResolver.Meta, options: Options): String? { override fun key(data: MediaResolver.Meta, options: Options): String? {
return "${data.source.url()}_${data.kind}" return "${data.source.url()}_${data.kind}"
} }