Skip to content

Commit e4d1428

Browse files
committed
Rename isInit to isTimelineInitialized for clarity.
1 parent fac919e commit e4d1428

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class RustTimeline(
8686
onNewSyncedEvent: () -> Unit,
8787
) : Timeline {
8888
private val initLatch = CompletableDeferred<Unit>()
89-
private val isInit = MutableStateFlow(false)
89+
private val isTimelineInitialized = MutableStateFlow(false)
9090

9191
private val _timelineItems: MutableStateFlow<List<MatrixTimelineItem>> =
9292
MutableStateFlow(emptyList())
@@ -110,7 +110,7 @@ class RustTimeline(
110110
timelineCoroutineScope = coroutineScope,
111111
timelineDiffProcessor = timelineDiffProcessor,
112112
initLatch = initLatch,
113-
isInit = isInit,
113+
isTimelineInitialized = isTimelineInitialized,
114114
dispatcher = dispatcher,
115115
onNewSyncedEvent = onNewSyncedEvent,
116116
)
@@ -189,7 +189,7 @@ class RustTimeline(
189189
}
190190

191191
private fun canPaginate(direction: Timeline.PaginationDirection): Boolean {
192-
if (!isInit.value) return false
192+
if (!isTimelineInitialized.value) return false
193193
return when (direction) {
194194
Timeline.PaginationDirection.BACKWARDS -> backPaginationStatus.value.canPaginate
195195
Timeline.PaginationDirection.FORWARDS -> forwardPaginationStatus.value.canPaginate
@@ -208,8 +208,12 @@ class RustTimeline(
208208
backPaginationStatus.map { it.hasMoreToLoad }.distinctUntilChanged(),
209209
forwardPaginationStatus.map { it.hasMoreToLoad }.distinctUntilChanged(),
210210
matrixRoom.roomInfoFlow.map { it.creator },
211-
isInit,
212-
) { timelineItems, hasMoreToLoadBackward, hasMoreToLoadForward, roomCreator, isInit ->
211+
isTimelineInitialized,
212+
) { timelineItems,
213+
hasMoreToLoadBackward,
214+
hasMoreToLoadForward,
215+
roomCreator,
216+
isTimelineInitialized ->
213217
withContext(dispatcher) {
214218
timelineItems
215219
.let { items ->
@@ -223,7 +227,7 @@ class RustTimeline(
223227
.let { items ->
224228
loadingIndicatorsPostProcessor.process(
225229
items = items,
226-
isInit = isInit,
230+
isTimelineInitialized = isTimelineInitialized,
227231
hasMoreToLoadBackward = hasMoreToLoadBackward,
228232
hasMoreToLoadForward = hasMoreToLoadForward
229233
)
@@ -232,7 +236,7 @@ class RustTimeline(
232236
.let { items ->
233237
lastForwardIndicatorsPostProcessor.process(
234238
items = items,
235-
isInit = isInit,
239+
isTimelineInitialized = isTimelineInitialized,
236240
)
237241
}
238242
}

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriber.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal class TimelineItemsSubscriber(
3838
private val timeline: Timeline,
3939
private val timelineDiffProcessor: MatrixTimelineDiffProcessor,
4040
private val initLatch: CompletableDeferred<Unit>,
41-
private val isInit: MutableStateFlow<Boolean>,
41+
private val isTimelineInitialized: MutableStateFlow<Boolean>,
4242
private val onNewSyncedEvent: () -> Unit,
4343
) {
4444
private var subscriptionCount = 0
@@ -85,13 +85,13 @@ internal class TimelineItemsSubscriber(
8585
ensureActive()
8686
timelineDiffProcessor.postItems(it)
8787
}
88-
isInit.value = true
88+
isTimelineInitialized.value = true
8989
initLatch.complete(Unit)
9090
}
9191

9292
private suspend fun postDiffs(diffs: List<TimelineDiff>) {
9393
val diffsToProcess = diffs.toMutableList()
94-
if (!isInit.value) {
94+
if (!isTimelineInitialized.value) {
9595
val resetDiff = diffsToProcess.firstOrNull { it.change() == TimelineChange.RESET }
9696
if (resetDiff != null) {
9797
// Keep using the postItems logic so we can post the timelineItems asap.

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class LastForwardIndicatorsPostProcessor(
2222

2323
fun process(
2424
items: List<MatrixTimelineItem>,
25-
isInit: Boolean,
25+
isTimelineInitialized: Boolean,
2626
): List<MatrixTimelineItem> {
27-
if (!isInit) return items
27+
if (!isTimelineInitialized) return items
2828
// We don't need to add the last forward indicator if we are not in the FOCUSED_ON_EVENT mode
2929
if (mode != Timeline.Mode.FOCUSED_ON_EVENT) {
3030
return items

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import io.element.android.services.toolbox.api.systemclock.SystemClock
1616
class LoadingIndicatorsPostProcessor(private val systemClock: SystemClock) {
1717
fun process(
1818
items: List<MatrixTimelineItem>,
19-
isInit: Boolean,
19+
isTimelineInitialized: Boolean,
2020
hasMoreToLoadBackward: Boolean,
2121
hasMoreToLoadForward: Boolean,
2222
): List<MatrixTimelineItem> {
23-
if (!isInit) return items
23+
if (!isTimelineInitialized) return items
2424
val shouldAddForwardLoadingIndicator = hasMoreToLoadForward && items.isNotEmpty()
2525
val currentTimestamp = systemClock.epochMillis()
2626
return buildList {

0 commit comments

Comments
 (0)