From 7c1361a223ee3a828783ac80ddf42f7c1260adf9 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 7 Jan 2021 09:48:48 +0100
Subject: [PATCH] Revert "Fix member state setting filter"

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

This reverts commit 8c2dbc342b9cd54f346ec0fdbda6dddd04be913a.

Change-Id: I8e89dbffca2288a08c0ca95abd8e87890a3801b2
---
 .../detail/timeline/helper/TimelineSettingsFactory.kt     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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 e3ef432a62..1983b05ed3 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
@@ -54,15 +54,11 @@ class TimelineSettingsFactory @Inject constructor(
     }
 
     private fun List<String>.createAllowedEventTypeFilters(): List<EventTypeFilter> {
-        var result = map {
+        return map {
             EventTypeFilter(
                     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
     }
 }