rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2604 from vector-im/feature/ons/fix_hide_member_events

Browse Source 
Feature/ons/fix hide member events
This commit is contained in:
Benoit Marty 2021-01-04 10:48:22 +01:00 committed by GitHub
commit a7d8e74468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -11,6 +11,7 @@ Bugfix 🐛:
- Unspecced msgType field in m.sticker (#2580) - Unspecced msgType field in m.sticker (#2580)
- Wait for all room members to be known before sending a message to a e2e room (#2518) - Wait for all room members to be known before sending a message to a e2e room (#2518)
- Url previews sometimes attached to wrong message (#2561) - Url previews sometimes attached to wrong message (#2561)
- Hiding membership events works the exact opposite (#2603)
Translations 🗣: Translations 🗣:
- -

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

@ -57,7 +57,7 @@ class TimelineSettingsFactory @Inject constructor(
return map { return map {
EventTypeFilter( EventTypeFilter(
eventType = it, eventType = it,
stateKey = if (it == EventType.STATE_ROOM_MEMBER && userPreferencesProvider.shouldShowRoomMemberStateEvents()) session.myUserId else null stateKey = if (it == EventType.STATE_ROOM_MEMBER && !userPreferencesProvider.shouldShowRoomMemberStateEvents()) session.myUserId else null
) )
} }
} }