mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 05:25:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

also account for unread 1on1 messages for unreadMessages bubbleClicked

Browse source 
Fixes #1599

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-09-23 17:17:54 +02:00
parent 1342bd5df3
commit 638b7c8288
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View file

@ -626,20 +626,23 @@ public class ConversationsListController extends BaseController implements Searc
}
private void checkToShowUnreadBubble() {
try{
try {
int lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition();
for (AbstractFlexibleItem flexItem : callItems) {
Conversation conversationItem = ((ConversationItem) flexItem).getModel();
int position = adapter.getGlobalPositionOf(flexItem);
if (conversationItem.unreadMention && position > lastVisibleItem) {
if (!newMentionPopupBubble.isShown()){
if ((conversationItem.unreadMention ||
(conversationItem.unreadMessages > 0 &&
conversationItem.type == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)) &&
position > lastVisibleItem) {
if (!newMentionPopupBubble.isShown()) {
newMentionPopupBubble.show();
}
return;
}
}
newMentionPopupBubble.hide();
} catch (NullPointerException e){
} catch (NullPointerException e) {
Log.d(TAG, "A NPE was caught when trying to show the unread popup bubble. This might happen when the " +
"user already left the conversations-list screen so the popup bubble is not available anymore.", e);
}