Skip to content

Commit 4ed1332

Browse files
committed
fix(fc/messages/paging): only provide prevKey if currentPage > 0 _and_ messages for page is not empty
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 2b72a8b commit 4ed1332

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class RoomController @Inject constructor(
193193
}
194194

195195
private val pagingConfig =
196-
PagingConfig(pageSize = 25, initialLoadSize = 25, prefetchDistance = 10)
196+
PagingConfig(pageSize = 25, initialLoadSize = 25, prefetchDistance = 10, enablePlaceholders = true)
197197

198198
@OptIn(ExperimentalPagingApi::class)
199199
fun messages(conversationId: ID): Pager<Int, InflatedConversationMessage> =
@@ -367,7 +367,7 @@ private class MessagingPagingSource(
367367
.getPagedMessagesWithDetails(chatId, pageSize, offset, userId())
368368
.map { it.copy(pageIndex = currentPage) }
369369

370-
val prevKey = if (currentPage == 0) null else currentPage - 1
370+
val prevKey = if (currentPage > 0 && messages.isNotEmpty()) currentPage - 1 else null
371371
val nextKey = if (messages.size < pageSize) null else currentPage + 1
372372

373373
LoadResult.Page(

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/TipController.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)