filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix member state setting filter" 

Upstream uses a different fix: https://github.com/vector-im/element-android/pull/2581

This reverts commit 8c2dbc342b.

Change-Id: I8e89dbffca2288a08c0ca95abd8e87890a3801b2
This commit is contained in:
SpiritCroc 2021-01-07 09:48:48 +01:00
parent 1f8dd9fb19
commit 7c1361a223
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
View File

@ -54,15 +54,11 @@ class TimelineSettingsFactory @Inject constructor(
} }
private fun List<String>.createAllowedEventTypeFilters(): List<EventTypeFilter> { private fun List<String>.createAllowedEventTypeFilters(): List<EventTypeFilter> {
var result = map { return map {
EventTypeFilter( EventTypeFilter(
eventType = it, eventType = it,
stateKey = null stateKey = if (it == EventType.STATE_ROOM_MEMBER && userPreferencesProvider.shouldShowRoomMemberStateEvents()) session.myUserId else null
) )
} }
if (!userPreferencesProvider.shouldShowRoomMemberStateEvents()) {
result = result.filter { it.eventType != EventType.STATE_ROOM_MEMBER }
}
return result
} }
} }