mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-23 01:45:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Adds clearing to directParentNames

Browse source
This commit is contained in:
ericdecanini 2022-07-04 09:37:36 +01:00
parent b437996208
commit e003bc973a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
View file

@ -224,6 +224,7 @@ internal class RoomSummaryUpdater @Inject constructor(
.sort(RoomSummaryEntityFields.ROOM_ID) .sort(RoomSummaryEntityFields.ROOM_ID)
.findAll().map { .findAll().map {
it.flattenParentIds = null it.flattenParentIds = null
it.directParentNames.clear()
it to emptyList<RoomSummaryEntity>().toMutableSet() it to emptyList<RoomSummaryEntity>().toMutableSet()
} }
.toMap() .toMap()

2
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
View file

@ -207,7 +207,7 @@ class RoomSummaryItemFactory @Inject constructor(
private fun getSearchResultSubtitle(roomSummary: RoomSummary): String { private fun getSearchResultSubtitle(roomSummary: RoomSummary): String {
val userId = roomSummary.directUserId val userId = roomSummary.directUserId
val directParent = roomSummary.directParentNames.lastOrNull() val directParent = roomSummary.directParentNames.takeIf { it.isNotEmpty() }?.joinToString()
val canonicalAlias = roomSummary.canonicalAlias val canonicalAlias = roomSummary.canonicalAlias
return (userId ?: directParent ?: canonicalAlias).orEmpty() return (userId ?: directParent ?: canonicalAlias).orEmpty()