mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-26 23:25:20 +03:00
Merge pull request #1598 from nextcloud/bugfix/1596/fixNpeUnreadBubble
catch NPE for popup bubble
This commit is contained in:
commit
1342bd5df3
1 changed files with 14 additions and 9 deletions
|
@ -626,18 +626,23 @@ public class ConversationsListController extends BaseController implements Searc
|
|||
}
|
||||
|
||||
private void checkToShowUnreadBubble() {
|
||||
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()){
|
||||
newMentionPopupBubble.show();
|
||||
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()){
|
||||
newMentionPopupBubble.show();
|
||||
}
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
newMentionPopupBubble.hide();
|
||||
} 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);
|
||||
}
|
||||
newMentionPopupBubble.hide();
|
||||
}
|
||||
|
||||
private void showNewConversationsScreen() {
|
||||
|
|
Loading…
Reference in a new issue