6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fix / Day separator flickering in timeline 

Sending events were not filtered, so sending events like reactions would make the day separator appear
This commit is contained in:
Valere 2019-06-27 16:46:22 +02:00 committed by Benoit Marty
parent 17a4a86ad1
commit b92cc524b6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ internal class DefaultTimeline(
} }


var hasChanged = false var hasChanged = false
changeSet.changes.forEach {index -> changeSet.changes.forEach { index ->
val eventEntity = results[index] val eventEntity = results[index]
eventEntity?.eventId?.let { eventId -> eventEntity?.eventId?.let { eventId ->
builtEventsIdMap[eventId]?.let { builtIndex -> builtEventsIdMap[eventId]?.let { builtIndex ->
@ -289,10 +289,12 @@ internal class DefaultTimeline(
private fun buildSendingEvents(): List<TimelineEvent> { private fun buildSendingEvents(): List<TimelineEvent> {
val sendingEvents = ArrayList<TimelineEvent>() val sendingEvents = ArrayList<TimelineEvent>()
if (hasReachedEnd(Timeline.Direction.FORWARDS)) { if (hasReachedEnd(Timeline.Direction.FORWARDS)) {
roomEntity?.sendingTimelineEvents?.forEach { roomEntity?.sendingTimelineEvents
val timelineEvent = timelineEventFactory.create(it) ?.filter { allowedTypes?.contains(it.type) ?: false }
sendingEvents.add(timelineEvent) ?.forEach {
} val timelineEvent = timelineEventFactory.create(it)
sendingEvents.add(timelineEvent)
}
} }
return sendingEvents return sendingEvents
} }
@ -303,14 +305,14 @@ internal class DefaultTimeline(


private fun getPaginationState(direction: Timeline.Direction): PaginationState { private fun getPaginationState(direction: Timeline.Direction): PaginationState {
return when (direction) { return when (direction) {
Timeline.Direction.FORWARDS -> forwardsPaginationState.get() Timeline.Direction.FORWARDS -> forwardsPaginationState.get()
Timeline.Direction.BACKWARDS -> backwardsPaginationState.get() Timeline.Direction.BACKWARDS -> backwardsPaginationState.get()
} }
} }


private fun updatePaginationState(direction: Timeline.Direction, update: (PaginationState) -> PaginationState) { private fun updatePaginationState(direction: Timeline.Direction, update: (PaginationState) -> PaginationState) {
val stateReference = when (direction) { val stateReference = when (direction) {
Timeline.Direction.FORWARDS -> forwardsPaginationState Timeline.Direction.FORWARDS -> forwardsPaginationState
Timeline.Direction.BACKWARDS -> backwardsPaginationState Timeline.Direction.BACKWARDS -> backwardsPaginationState
} }
val currentValue = stateReference.get() val currentValue = stateReference.get()