Room: remove bestName and use displayName instead of name where it makes sense
This commit is contained in:
parent
d59f59e9f6
commit
2dcd94076f
9 changed files with 26 additions and 36 deletions
|
|
@ -35,7 +35,6 @@ interface MatrixRoom : Closeable {
|
|||
val sessionId: SessionId
|
||||
val roomId: RoomId
|
||||
val name: String?
|
||||
val bestName: String
|
||||
val displayName: String
|
||||
val alias: String?
|
||||
val alternativeAliases: List<String>
|
||||
|
|
|
|||
|
|
@ -130,11 +130,6 @@ class RustMatrixRoom(
|
|||
return roomListItem.name()
|
||||
}
|
||||
|
||||
override val bestName: String
|
||||
get() {
|
||||
return name?.takeIf { it.isNotEmpty() } ?: innerRoom.id()
|
||||
}
|
||||
|
||||
override val displayName: String
|
||||
get() {
|
||||
return innerRoom.displayName()
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ class FakeMatrixRoom(
|
|||
override val sessionId: SessionId = A_SESSION_ID,
|
||||
override val roomId: RoomId = A_ROOM_ID,
|
||||
override val name: String? = null,
|
||||
override val bestName: String = "",
|
||||
override val displayName: String = "",
|
||||
override val topic: String? = null,
|
||||
override val avatarUrl: String? = null,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue