Merge pull request #589 from code-payments/release/fc/1.0.5

bmc08gt · web-flow · commit 9bbc49326124 · 2025-01-27T16:00:52.000-05:00
Flipchat release 1.0.5
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/MessagingPagingSource.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/MessagingPagingSource.kt
@@ -41,13 +41,12 @@ internal class MessagingPagingSource(
                 val messages =
                     db.conversationMessageDao()
                         .getPagedMessagesWithDetails(chatId, pageSize, offset, userId())
-                        .map { it.copy(pageIndex = currentPage) }
 
                 val prevKey = if (currentPage > 0 && messages.isNotEmpty()) currentPage - 1 else null
                 val nextKey = if (messages.size < pageSize) null else currentPage + 1
 
                 LoadResult.Page(
-                    data = messages,
+                    data = messages.map { if (prevKey == null) it.copy(pageIndex = currentPage) else it },
                     prevKey = prevKey,
                     nextKey = nextKey,
                 )
@@ -57,4 +56,3 @@ internal class MessagingPagingSource(
         }
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,12 @@ internal class MessagingPagingSource(`
`41`	`41`	`val messages =`
`42`	`42`	`db.conversationMessageDao()`
`43`	`43`	`.getPagedMessagesWithDetails(chatId, pageSize, offset, userId())`
`44`		`- .map { it.copy(pageIndex = currentPage) }`
`45`	`44`
`46`	`45`	`val prevKey = if (currentPage > 0 && messages.isNotEmpty()) currentPage - 1 else null`
`47`	`46`	`val nextKey = if (messages.size < pageSize) null else currentPage + 1`
`48`	`47`
`49`	`48`	`LoadResult.Page(`
`50`		`- data = messages,`
	`49`	`+ data = messages.map { if (prevKey == null) it.copy(pageIndex = currentPage) else it },`
`51`	`50`	`prevKey = prevKey,`
`52`	`51`	`nextKey = nextKey,`
`53`	`52`	`)`
`@@ -57,4 +56,3 @@ internal class MessagingPagingSource(`
`57`	`56`	`}`
`58`	`57`	`}`
`59`	`58`	`}`
`60`		`-`