From 6bc0a64c7357339dbb51a78d3000ddc0a2553629 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 4 Jun 2018 21:41:26 +0200
Subject: [PATCH] Try to fix another bug

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/controllers/ChatController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 71be6c0dc..ec2e75fb4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -325,7 +325,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
                         if (layoutManager.findFirstCompletelyVisibleItemPosition() < newMessagesCount) {
                             newMessagesCount = 0;
 
-                            if (popupBubble.isShown()) {
+                            if (popupBubble != null && popupBubble.isShown()) {
                                 popupBubble.hide();
                             }
                         }
@@ -693,7 +693,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
                     boolean shouldScroll = layoutManager.findFirstVisibleItemPosition() == 0 ||
                             adapter.getItemCount() == 0;
 
-                    if (!shouldScroll) {
+                    if (!shouldScroll && popupBubble != null) {
                         if (!popupBubble.isShown()) {
                             newMessagesCount = 1;
                             popupBubble.show();