mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Drop the comments from the grouping timeout
Review feedback: the constant name and the test names carry the rule.
This commit is contained in:
-5
@@ -38,7 +38,6 @@ import io.element.android.libraries.matrix.ui.messages.reply.map
|
|||||||
import kotlinx.collections.immutable.persistentListOf
|
import kotlinx.collections.immutable.persistentListOf
|
||||||
import kotlinx.collections.immutable.toImmutableList
|
import kotlinx.collections.immutable.toImmutableList
|
||||||
|
|
||||||
/** Events further apart than this are never grouped together, even when sent by the same person. */
|
|
||||||
private const val GROUPING_TIMEOUT_MS = 5 * 60 * 1000L
|
private const val GROUPING_TIMEOUT_MS = 5 * 60 * 1000L
|
||||||
|
|
||||||
@AssistedInject
|
@AssistedInject
|
||||||
@@ -224,10 +223,6 @@ class TimelineItemEventFactory(
|
|||||||
val previousSender = prevTimelineItem?.event?.sender
|
val previousSender = prevTimelineItem?.event?.sender
|
||||||
val nextSender = nextTimelineItem?.event?.sender
|
val nextSender = nextTimelineItem?.event?.sender
|
||||||
|
|
||||||
// Two events from the same sender are only grouped together if they were sent within
|
|
||||||
// GROUPING_TIMEOUT_MS of each other. The delta is symmetric between a pair of neighbours, so
|
|
||||||
// both items always agree on where the group is split.
|
|
||||||
// See https://github.com/element-hq/element-x-android/issues/4757
|
|
||||||
val previousIsGroupable = prevTimelineItem?.let {
|
val previousIsGroupable = prevTimelineItem?.let {
|
||||||
it.canBeDisplayedInBubbleBlock() &&
|
it.canBeDisplayedInBubbleBlock() &&
|
||||||
currentTimelineItem.event.timestamp - it.event.timestamp <= GROUPING_TIMEOUT_MS
|
currentTimelineItem.event.timestamp - it.event.timestamp <= GROUPING_TIMEOUT_MS
|
||||||
|
|||||||
-2
@@ -106,8 +106,6 @@ class TimelineItemsFactoryTest {
|
|||||||
roomMembers = emptyList(),
|
roomMembers = emptyList(),
|
||||||
renderReadReceipts = false,
|
renderReadReceipts = false,
|
||||||
)
|
)
|
||||||
// The factory emits the timeline newest-first; reverse it so the assertions below read
|
|
||||||
// in the same chronological order as the timestamps that were fed in.
|
|
||||||
positions = awaitItem()
|
positions = awaitItem()
|
||||||
.filterIsInstance<TimelineItem.Event>()
|
.filterIsInstance<TimelineItem.Event>()
|
||||||
.map { it.groupPosition }
|
.map { it.groupPosition }
|
||||||
|
|||||||
Reference in New Issue
Block a user