gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1600 from nextcloud/bugfix/1599/unreadMessagesBubble

Browse Source 
Also account for unread 1on1 messages for unreadMessages bubbleClicked
This commit is contained in:
Andy Scherzinger 2021-09-23 17:39:01 +02:00 committed by GitHub
commit 49d083d320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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() { private void checkToShowUnreadBubble() {
try{ try {
int lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition(); int lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition();
for (AbstractFlexibleItem flexItem : callItems) { for (AbstractFlexibleItem flexItem : callItems) {
Conversation conversationItem = ((ConversationItem) flexItem).getModel(); Conversation conversationItem = ((ConversationItem) flexItem).getModel();
int position = adapter.getGlobalPositionOf(flexItem); int position = adapter.getGlobalPositionOf(flexItem);
if (conversationItem.unreadMention && position > lastVisibleItem) { if ((conversationItem.unreadMention ||
if (!newMentionPopupBubble.isShown()){ (conversationItem.unreadMessages > 0 &&
conversationItem.type == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)) &&
position > lastVisibleItem) {
if (!newMentionPopupBubble.isShown()) {
newMentionPopupBubble.show(); newMentionPopupBubble.show();
} }
return; return;
} }
} }
newMentionPopupBubble.hide(); 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 " + 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); "user already left the conversations-list screen so the popup bubble is not available anymore.", e);
} }