filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Timeline rework: handle lastForwardChunk

This commit is contained in:
ganfra 2021-09-17 17:51:40 +02:00
parent da75642b92
commit 2283030c9b
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
View File

@ -104,13 +104,9 @@ internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
return if (direction == Timeline.Direction.FORWARDS) {
val nextChunkEntity = chunkEntity.nextChunk
if (nextChunkEntity == null) {
val token = chunkEntity.nextToken ?: return LoadMoreResult.REACHED_END // TODO handle previous live chunk
try {
fetchFromServer(token, direction)
} catch (failure: Throwable) {
Timber.v("Failed to fetch from server: $failure")
LoadMoreResult.FAILURE
}
// Fetch next chunk from server if not in the db
val token = chunkEntity.nextToken
fetchFromServer(token, direction)
} else {
// otherwise we delegate to the next chunk
if (nextChunk == null) {
@ -121,13 +117,9 @@ internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
} else {
val prevChunkEntity = chunkEntity.prevChunk
if (prevChunkEntity == null) {
val token = chunkEntity.prevToken ?: return LoadMoreResult.REACHED_END
try {
fetchFromServer(token, direction)
} catch (failure: Throwable) {
Timber.v("Failed to fetch from server: $failure")
LoadMoreResult.FAILURE
}
// Fetch prev chunk from server if not in the db
val token = chunkEntity.prevToken
fetchFromServer(token, direction)
} else {
// otherwise we delegate to the prev chunk
if (prevChunk == null) {
@ -193,10 +185,26 @@ internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
)
}
private suspend fun fetchFromServer(token: String, direction: Timeline.Direction): LoadMoreResult {
val paginationParams = PaginationTask.Params(roomId, token, direction.toPaginationDirection(), PAGINATION_COUNT)
val paginationResult = paginationTask.execute(paginationParams)
return when (paginationResult) {
private suspend fun fetchFromServer(token: String?, direction: Timeline.Direction): LoadMoreResult {
val paginationResult = try {
if (token == null) {
if (direction == Timeline.Direction.BACKWARDS || !chunkEntity.hasBeenALastForwardChunk()) return LoadMoreResult.REACHED_END
val lastKnownEventId = chunkEntity.sortedTimelineEvents().firstOrNull()?.eventId ?: return LoadMoreResult.FAILURE
val taskParams = FetchTokenAndPaginateTask.Params(roomId, lastKnownEventId, direction.toPaginationDirection(), PAGINATION_COUNT)
fetchTokenAndPaginateTask.execute(taskParams)
} else {
val taskParams = PaginationTask.Params(roomId, token, direction.toPaginationDirection(), PAGINATION_COUNT)
paginationTask.execute(taskParams)
}
} catch (failure: Throwable) {
Timber.e("Failed to fetch from server: $failure", failure)
return LoadMoreResult.FAILURE
}
return paginationResult.toLoadMoreResult()
}
private fun TokenChunkEventPersistor.Result.toLoadMoreResult(): LoadMoreResult {
return when (this) {
TokenChunkEventPersistor.Result.REACHED_END -> LoadMoreResult.REACHED_END
TokenChunkEventPersistor.Result.SHOULD_FETCH_MORE,
TokenChunkEventPersistor.Result.SUCCESS -> LoadMoreResult.SUCCESS