From 3240cadb94b3faed6674eb05d8506e7cb9956b46 Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Wed, 30 Dec 2020 12:08:27 +0300 Subject: [PATCH 1/2] Fix membership event visibility condition. --- CHANGES.md | 1 + .../home/room/detail/timeline/helper/TimelineSettingsFactory.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 373c3aa985..74710baf48 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ Improvements 🙌: Bugfix 🐛: - 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) + - Fix member state filter (#2581) Translations 🗣: - diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt index 1983b05ed3..01c7ad3986 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt @@ -57,7 +57,7 @@ class TimelineSettingsFactory @Inject constructor( return map { EventTypeFilter( 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 ) } } From 05013d25594ccd14a8a19f058d2b5a2c330da5a7 Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Wed, 30 Dec 2020 12:17:25 +0300 Subject: [PATCH 2/2] Fix changelog. --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 74710baf48..1fa3eb8e4b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,7 +10,7 @@ Improvements 🙌: Bugfix 🐛: - 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) - - Fix member state filter (#2581) + - Hiding membership events works the exact opposite (#2603) Translations 🗣: -