filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix in memory local echo filtering

Browse Source
This commit is contained in:
ganfra 2020-06-23 12:23:23 +02:00
parent f762c4c7a2
commit 6e95c6c200
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
View File

@ -790,11 +790,7 @@ internal class DefaultTimeline(
private fun List<TimelineEvent>.filterEventsWithSettings(): List<TimelineEvent> {
return filter {
val filterType = if (settings.filterTypes) {
settings.allowedTypes.contains(it.root.type)
} else {
true
}
val filterType = !settings.filterTypes || settings.allowedTypes.contains(it.root.type)
if (!filterType) return@filter false
val filterEdits = if (settings.filterEdits && it.root.type == EventType.MESSAGE) {
@ -805,7 +801,7 @@ internal class DefaultTimeline(
}
if (!filterEdits) return@filter false
val filterRedacted = settings.filterRedacted && it.root.isRedacted()
val filterRedacted = !settings.filterRedacted || it.root.isRedacted()
filterRedacted
}