Browse Source

Fix another crash

Mario Danic 6 years ago
parent
commit
35fd4d36a9

+ 4 - 2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java

@@ -855,9 +855,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
                 NotificationUtils.cancelExistingNotifications(getApplicationContext(), conversationUser);
                 NotificationUtils.cancelExistingNotifications(getApplicationContext(), conversationUser);
 
 
                 isFirstMessagesProcessing = false;
                 isFirstMessagesProcessing = false;
-                loadingProgressBar.setVisibility(View.GONE);
+                if (loadingProgressBar != null) {
+                    loadingProgressBar.setVisibility(View.GONE);
+                }
 
 
-                if (emptyLayout.getVisibility() != View.VISIBLE) {
+                if (emptyLayout != null && emptyLayout.getVisibility() != View.VISIBLE) {
                     emptyLayout.setVisibility(View.VISIBLE);
                     emptyLayout.setVisibility(View.VISIBLE);
                 }
                 }
             }
             }