From 8a07e94e0e68d552c812be5deb1df4232c9ffeee Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 16 Apr 2019 15:04:11 +0200
Subject: [PATCH] Fix a crashing bug

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../controllers/ConversationsListController.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
index c3efb36bd..b928d507a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -468,21 +468,27 @@ public class ConversationsListController extends BaseController implements Searc
             @Override
             public void onChanged() {
                 super.onChanged();
-                recyclerView.smoothScrollToPosition(scrollTo);
+                if (recyclerView != null) {
+                    recyclerView.smoothScrollToPosition(scrollTo);
+                }
                 lastClickedConversationToken = "";
             }
 
             @Override
             public void onItemRangeChanged(int positionStart, int itemCount) {
                 super.onItemRangeChanged(positionStart, itemCount);
-                recyclerView.smoothScrollToPosition(scrollTo);
+                if (recyclerView != null) {
+                    recyclerView.smoothScrollToPosition(scrollTo);
+                }
                 lastClickedConversationToken = "";
             }
 
             @Override
             public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Object payload) {
                 super.onItemRangeChanged(positionStart, itemCount, payload);
-                recyclerView.smoothScrollToPosition(scrollTo);
+                if (recyclerView != null) {
+                    recyclerView.smoothScrollToPosition(scrollTo);
+                }
                 lastClickedConversationToken = "";
             }
         });