From 139c1f172425534d405394f0f8c1e5247e83fc1f Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 23 Sep 2019 14:33:13 +0200 Subject: [PATCH] Fix some lobby crashes Signed-off-by: Mario Danic --- .../nextcloud/talk/controllers/ChatController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 f880addd7..48595461f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -585,7 +585,9 @@ public class ChatController extends BaseController implements MessagesListAdapte } if (currentConversation.shouldShowLobby(conversationUser)) { - lobbyView.setVisibility(View.VISIBLE); + if (lobbyView != null) { + lobbyView.setVisibility(View.VISIBLE); + } messagesListView.setVisibility(View.GONE); messageInputView.setVisibility(View.GONE); loadingProgressBar.setVisibility(View.GONE); @@ -596,12 +598,16 @@ public class ChatController extends BaseController implements MessagesListAdapte conversationLobbyText.setText(R.string.nc_lobby_waiting); } } else { - lobbyView.setVisibility(View.GONE); + if (lobbyView != null) { + lobbyView.setVisibility(View.GONE); + } messagesListView.setVisibility(View.VISIBLE); messageInput.setVisibility(View.VISIBLE); } } else { - lobbyView.setVisibility(View.GONE); + if (lobbyView != null) { + lobbyView.setVisibility(View.GONE); + } messagesListView.setVisibility(View.VISIBLE); messageInput.setVisibility(View.VISIBLE); }