gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-18 02:05:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3909 from nextcloud/bugfix/3903/fixUnreadScrollingAndUnreadBubble

Browse Source 
fix unread message behavior
This commit is contained in:
Sowjanya Kota 2024-05-17 10:41:18 +02:00 committed by GitHub
commit 7bd2e6c81a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3767,8 +3767,16 @@ class ChatActivity :
} }
private fun processMessagesFromTheFuture(chatMessageList: List<ChatMessage>) { private fun processMessagesFromTheFuture(chatMessageList: List<ChatMessage>) {
val shouldAddNewMessagesNotice = layoutManager?.findFirstVisibleItemPosition()!! > 0 val newMessagesAvailable = (adapter?.itemCount ?: 0) > 0 && chatMessageList.isNotEmpty()
if (shouldAddNewMessagesNotice) { val insertNewMessagesNotice = if (newMessagesAvailable) {
chatMessageList.any { it.actorId != conversationUser!!.userId }
} else {
false
}
val scrollToEndOnUpdate = layoutManager?.findFirstVisibleItemPosition() == 0
if (insertNewMessagesNotice) {
val unreadChatMessage = ChatMessage() val unreadChatMessage = ChatMessage()
unreadChatMessage.jsonMessageId = -1 unreadChatMessage.jsonMessageId = -1
unreadChatMessage.actorId = "-1" unreadChatMessage.actorId = "-1"
@ -3777,7 +3785,41 @@ class ChatActivity :
adapter?.addToStart(unreadChatMessage, false) adapter?.addToStart(unreadChatMessage, false)
} }
addMessagesToAdapter(shouldAddNewMessagesNotice, chatMessageList) if (!scrollToEndOnUpdate) {
binding.popupBubbleView.isShown.let {
if (it) {
newMessagesCount++
} else {
newMessagesCount = 1
binding.scrollDownButton.visibility = View.GONE
binding.popupBubbleView.show()
}
}
} else {
binding.scrollDownButton.visibility = View.GONE
newMessagesCount = 0
}
for (chatMessage in chatMessageList) {
chatMessage.activeUser = conversationUser
adapter?.let {
chatMessage.isGrouped = (
it.isPreviousSameAuthor(chatMessage.actorId, -1) &&
it.getSameAuthorLastMessagesCount(chatMessage.actorId) %
GROUPED_MESSAGES_SAME_AUTHOR_THRESHOLD > 0
)
chatMessage.isOneToOneConversation =
(currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)
chatMessage.isFormerOneToOneConversation =
(currentConversation?.type == ConversationType.FORMER_ONE_TO_ONE)
it.addToStart(chatMessage, scrollToEndOnUpdate)
}
}
if (insertNewMessagesNotice && scrollToEndOnUpdate && adapter != null) {
scrollToFirstUnreadMessage()
}
} }
private fun processMessagesNotFromTheFuture(chatMessageList: List<ChatMessage>) { private fun processMessagesNotFromTheFuture(chatMessageList: List<ChatMessage>) {
@ -3822,53 +3864,6 @@ class ChatActivity :
} }
} }
private fun addMessagesToAdapter(shouldAddNewMessagesNotice: Boolean, chatMessageList: List<ChatMessage>) {
val isThereANewNotice =
shouldAddNewMessagesNotice || adapter?.getMessagePositionByIdInReverse("-1") != -1
for (chatMessage in chatMessageList) {
chatMessage.activeUser = conversationUser
val shouldScroll =
!isThereANewNotice &&
!shouldAddNewMessagesNotice &&
layoutManager?.findFirstVisibleItemPosition() == 0 ||
adapter != null &&
adapter?.itemCount == 0
modifyMessageCount(shouldAddNewMessagesNotice, shouldScroll)
adapter?.let {
chatMessage.isGrouped = (
it.isPreviousSameAuthor(chatMessage.actorId, -1) &&
it.getSameAuthorLastMessagesCount(chatMessage.actorId) %
GROUPED_MESSAGES_SAME_AUTHOR_THRESHOLD > 0
)
chatMessage.isOneToOneConversation =
(currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)
chatMessage.isFormerOneToOneConversation =
(currentConversation?.type == ConversationType.FORMER_ONE_TO_ONE)
it.addToStart(chatMessage, shouldScroll)
}
}
}
private fun modifyMessageCount(shouldAddNewMessagesNotice: Boolean, shouldScroll: Boolean) {
if (shouldAddNewMessagesNotice) {
binding.popupBubbleView.isShown.let {
if (it) {
newMessagesCount++
} else {
newMessagesCount = 1
binding.scrollDownButton.visibility = View.GONE
binding.popupBubbleView.show()
}
}
} else {
binding.scrollDownButton.visibility = View.GONE
newMessagesCount = 0
}
}
private fun determinePreviousMessageIds(chatMessageList: List<ChatMessage>) { private fun determinePreviousMessageIds(chatMessageList: List<ChatMessage>) {
var previousMessageId = NO_PREVIOUS_MESSAGE_ID var previousMessageId = NO_PREVIOUS_MESSAGE_ID
for (i in chatMessageList.indices.reversed()) { for (i in chatMessageList.indices.reversed()) {