gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4865 from nextcloud/bugfix/4864/fixNpeOnLoadMore

Browse Source 
avoid NPE in onLoadMore
This commit is contained in:
Marcel Hibbe 2025-04-14 13:39:31 +00:00 committed by GitHub
commit d617d65af2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -2818,21 +2818,23 @@ class ChatActivity :
DateFormatter.isSameDay(message1.createdAt, message2.createdAt) DateFormatter.isSameDay(message1.createdAt, message2.createdAt)
override fun onLoadMore(page: Int, totalItemsCount: Int) { override fun onLoadMore(page: Int, totalItemsCount: Int) {
val id = ( val messageId = (
adapter?.items?.last { adapter?.items
it.item is ChatMessage ?.lastOrNull { it.item is ChatMessage }
}?.item as ChatMessage ?.item as? ChatMessage
).jsonMessageId )?.jsonMessageId
val urlForChatting = ApiUtils.getUrlForChat(chatApiVersion, conversationUser?.baseUrl, roomToken) messageId?.let {
val urlForChatting = ApiUtils.getUrlForChat(chatApiVersion, conversationUser?.baseUrl, roomToken)
chatViewModel.loadMoreMessages( chatViewModel.loadMoreMessages(
beforeMessageId = id.toLong(), beforeMessageId = it.toLong(),
withUrl = urlForChatting, withUrl = urlForChatting,
withCredentials = credentials!!, withCredentials = credentials!!,
withMessageLimit = MESSAGE_PULL_LIMIT, withMessageLimit = MESSAGE_PULL_LIMIT,
roomToken = currentConversation!!.token roomToken = currentConversation!!.token
) )
}
} }
override fun format(date: Date): String = override fun format(date: Date): String =