mirror of
https://github.com/element-hq/element-android
synced 2024-10-25 20:28:53 +03:00
Fix in memory local echo filtering
This commit is contained in:
parent
f762c4c7a2
commit
6e95c6c200
1 changed files with 2 additions and 6 deletions
|
@ -790,11 +790,7 @@ internal class DefaultTimeline(
|
||||||
|
|
||||||
private fun List<TimelineEvent>.filterEventsWithSettings(): List<TimelineEvent> {
|
private fun List<TimelineEvent>.filterEventsWithSettings(): List<TimelineEvent> {
|
||||||
return filter {
|
return filter {
|
||||||
val filterType = if (settings.filterTypes) {
|
val filterType = !settings.filterTypes || settings.allowedTypes.contains(it.root.type)
|
||||||
settings.allowedTypes.contains(it.root.type)
|
|
||||||
} else {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
if (!filterType) return@filter false
|
if (!filterType) return@filter false
|
||||||
|
|
||||||
val filterEdits = if (settings.filterEdits && it.root.type == EventType.MESSAGE) {
|
val filterEdits = if (settings.filterEdits && it.root.type == EventType.MESSAGE) {
|
||||||
|
@ -805,7 +801,7 @@ internal class DefaultTimeline(
|
||||||
}
|
}
|
||||||
if (!filterEdits) return@filter false
|
if (!filterEdits) return@filter false
|
||||||
|
|
||||||
val filterRedacted = settings.filterRedacted && it.root.isRedacted()
|
val filterRedacted = !settings.filterRedacted || it.root.isRedacted()
|
||||||
|
|
||||||
filterRedacted
|
filterRedacted
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue