enki/blap-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases 4 Wiki Activity

Revert screen recomposition fixes

Browse Source
This commit is contained in:
bxdxnn
2026-05-29 10:56:18 +00:00
parent e1f968390a
commit 64b6a1523d
2 changed files with 8 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+8 -19
View File
@@ -51,7 +51,6 @@ import io.element.android.libraries.matrix.api.core.asEventId
import io.element.android.libraries.matrix.api.room.JoinedRoom
import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
import io.element.android.libraries.matrix.api.room.roomMembers
import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
import io.element.android.libraries.matrix.api.timeline.ReceiptType
import io.element.android.libraries.matrix.api.timeline.Timeline
import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
@@ -255,25 +254,15 @@ class TimelinePresenter(
}
.launchIn(this)
var previousItems: List<MatrixTimelineItem>? = null
combine(timelineController.timelineItems(), room.membersStateFlow) { items, membersState ->
val roomMembers = membersState.roomMembers().orEmpty()
if (previousItems !== items) {
previousItems = items
val parent = analyticsService.getLongRunningTransaction(DisplayFirstTimelineItems)
val transaction = parent?.startChild("timelineItemsFactory.replaceWith", "Processing timeline items")
transaction?.putExtraData(AnalyticsUserData.TIMELINE_ITEM_COUNT, items.count().toString())
timelineItemsFactory.replaceWith(
timelineItems = items,
roomMembers = roomMembers
)
transaction?.finish()
} else {
timelineItemsFactory.updateRoomMembers(
timelineItems = items,
roomMembers = roomMembers
)
}
val parent = analyticsService.getLongRunningTransaction(DisplayFirstTimelineItems)
val transaction = parent?.startChild("timelineItemsFactory.replaceWith", "Processing timeline items")
transaction?.putExtraData(AnalyticsUserData.TIMELINE_ITEM_COUNT, items.count().toString())
timelineItemsFactory.replaceWith(
timelineItems = items,
roomMembers = membersState.roomMembers().orEmpty()
)
transaction?.finish()
items
}
.onEach(redactedVoiceMessageManager::onEachMatrixTimelineItem)
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt
-39
View File
@@ -72,45 +72,6 @@ class TimelineItemsFactory(
}
}
/**
* Lightweight update that only refreshes member-derived data (e.g., read receipt display names)
* on cached items without rebuilding the diff cache or creating new items.
* Skips emission if no cached items have member-dependent state.
*/
suspend fun updateRoomMembers(
timelineItems: List<MatrixTimelineItem>,
roomMembers: List<RoomMember>,
) = withContext(dispatchers.computation) {
lock.withLock {
var hasUpdates = false
val updatedStates = ArrayList<TimelineItem>()
for (index in diffCache.indices().reversed()) {
val cacheItem = diffCache.get(index)
if (cacheItem is TimelineItem.Event && roomMembers.isNotEmpty()) {
val updatedItem = eventItemFactory.update(
timelineItem = cacheItem,
receivedMatrixTimelineItem = timelineItems[index] as MatrixTimelineItem.Event,
roomMembers = roomMembers
)
diffCache[index] = updatedItem
hasUpdates = true
updatedStates.add(updatedItem)
} else if (cacheItem != null) {
updatedStates.add(cacheItem)
} else {
buildAndCacheItem(timelineItems, index, roomMembers)?.also { timelineItemState ->
updatedStates.add(timelineItemState)
}
}
}
if (hasUpdates) {
val result = timelineItemGrouper.group(updatedStates).toImmutableList()
val filteredResult = filterEmptyDaySeparators(result)
_timelineItems.emit(filteredResult)
}
}
}
private suspend fun buildAndEmitTimelineItemStates(
timelineItems: List<MatrixTimelineItem>,
roomMembers: List<RoomMember>,