gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 04:29:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2800 from nextcloud/bugfix/noid/avoidNpeForUnreadBubble

Browse Source 
Bugfix/noid/avoid npe for unread bubble
This commit is contained in:
Andy Scherzinger 2023-02-27 16:44:25 +01:00 committed by GitHub
commit f1fd334b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -2533,14 +2533,17 @@ class ChatController(args: Bundle) :
private fun modifyMessageCount(shouldAddNewMessagesNotice: Boolean, shouldScroll: Boolean) { private fun modifyMessageCount(shouldAddNewMessagesNotice: Boolean, shouldScroll: Boolean) {
if (!shouldAddNewMessagesNotice && !shouldScroll) { if (!shouldAddNewMessagesNotice && !shouldScroll) {
if (!binding?.popupBubbleView?.isShown!!) { binding?.popupBubbleView?.isShown?.let {
newMessagesCount = 1 if (it) {
binding?.scrollDownButton?.visibility = View.GONE newMessagesCount++
binding?.popupBubbleView?.show() } else {
} else if (binding?.popupBubbleView?.isShown!!) { newMessagesCount = 1
newMessagesCount++ binding?.scrollDownButton?.visibility = View.GONE
binding?.popupBubbleView?.show()
}
} }
} else { } else {
binding?.scrollDownButton?.visibility = View.GONE
newMessagesCount = 0 newMessagesCount = 0
} }
} }