mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 10:55:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Still need to link empty chunks to glue everything together

Browse source 
Change-Id: Ic037db94d044c7271fe2f016a58c153945b73615
This commit is contained in:
SpiritCroc 2022-05-03 22:48:03 +02:00
parent 099bf5a016
commit 8158fff0f7
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
View file

@ -182,6 +182,7 @@ internal class TokenChunkEventPersistor @Inject constructor(
}
val optimizedThreadSummaryMap = hashMapOf<String, EventEntity>()
var hasNewEvents = false
var existingChunkToLink: ChunkEntity? = null
run processTimelineEvents@{
eventList.forEach { event ->
if (event.eventId == null || event.senderId == null) {
@ -196,13 +197,6 @@ internal class TokenChunkEventPersistor @Inject constructor(
// If it exists, we want to stop here, just link the prevChunk
val existingChunk = existingTimelineEvent?.chunk?.firstOrNull()
if (existingChunk != null) {
// If we haven't found a single new event yet, we don't want to link in the pagination direction, as that might cause a
// timeline loop if the other chunk is in the other direction.
if (!hasNewEvents) {
Timber.i("Skip adding event $eventId, already exists")
// Only skip this event, but still process other events
return@forEach
}
val alreadyLinkedNext = currentChunk.doesNextChunksVerifyCondition { it == existingChunk }
val alreadyLinkedPrev = currentChunk.doesPrevChunksVerifyCondition { it == existingChunk }
if (alreadyLinkedNext || alreadyLinkedPrev) {
@ -217,6 +211,18 @@ internal class TokenChunkEventPersistor @Inject constructor(
// Stop processing here
return@processTimelineEvents
}
// If we haven't found a single new event yet, we don't want to link in the pagination direction, as that might cause a
// timeline loop if the other chunk is in the other direction.
if (!hasNewEvents) {
Timber.i("Skip adding event $eventId, already exists")
// Only skip this event, but still process other events.
// Remember this chunk, since in case we don't find any new events, we still want to link this in pagination direction
// in order to link a chunk to the /sync chunk
if (existingChunkToLink == null) {
existingChunkToLink = existingChunk
}
return@forEach
}
when (direction) {
PaginationDirection.BACKWARDS -> {
Timber.i("Backwards insert chunk: ${existingChunk.identifier()} -> ${currentChunk.identifier()}")
@ -263,6 +269,22 @@ internal class TokenChunkEventPersistor @Inject constructor(
}
}
}
val existingChunk = existingChunkToLink
if (!hasNewEvents && existingChunk != null) {
when (direction) {
PaginationDirection.BACKWARDS -> {
Timber.i("Backwards insert chunk: ${existingChunk.identifier()} -> ${currentChunk.identifier()}")
currentChunk.prevChunk = existingChunk
existingChunk.nextChunk = currentChunk
}
PaginationDirection.FORWARDS -> {
Timber.i("Forward insert chunk: ${currentChunk.identifier()} -> ${existingChunk.identifier()}")
currentChunk.nextChunk = existingChunk
existingChunk.prevChunk = currentChunk
}
}
}
if (currentChunk.isValid) {
RoomEntity.where(realm, roomId).findFirst()?.addIfNecessary(currentChunk)
}