gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-17 01:35:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some lobby crashes

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-23 14:33:13 +02:00
parent ecfe91f36f
commit 139c1f1724
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -585,7 +585,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
if (currentConversation.shouldShowLobby(conversationUser)) { if (currentConversation.shouldShowLobby(conversationUser)) {
if (lobbyView != null) {
lobbyView.setVisibility(View.VISIBLE); lobbyView.setVisibility(View.VISIBLE);
}
messagesListView.setVisibility(View.GONE); messagesListView.setVisibility(View.GONE);
messageInputView.setVisibility(View.GONE); messageInputView.setVisibility(View.GONE);
loadingProgressBar.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); conversationLobbyText.setText(R.string.nc_lobby_waiting);
} }
} else { } else {
if (lobbyView != null) {
lobbyView.setVisibility(View.GONE); lobbyView.setVisibility(View.GONE);
}
messagesListView.setVisibility(View.VISIBLE); messagesListView.setVisibility(View.VISIBLE);
messageInput.setVisibility(View.VISIBLE); messageInput.setVisibility(View.VISIBLE);
} }
} else { } else {
if (lobbyView != null) {
lobbyView.setVisibility(View.GONE); lobbyView.setVisibility(View.GONE);
}
messagesListView.setVisibility(View.VISIBLE); messagesListView.setVisibility(View.VISIBLE);
messageInput.setVisibility(View.VISIBLE); messageInput.setVisibility(View.VISIBLE);
} }