From de6cfabdef73a01c5b338157c0687bc473980618 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 18 Sep 2024 17:34:10 +0200 Subject: [PATCH] fix to hide messageInputFragment when user has no restriction to write The messageInputFragment was hidden by checkShowMessageInputView(), but it was immediately shown again by checkLobbyState() This fix will execute checkShowMessageInputView() inside checkLobbyState() in the correct order. Additionally, the check checkLobbyState() has to be already executed in GetCapabilitiesInitialLoadState as well as checkShowCallButtons() Otherwise the expected behavior would only be set after 30 seconds. An improvemnt for the future must be to improve the capabilities handling. Signed-off-by: Marcel Hibbe --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index ae0cc210e5..94ffafe28a 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -577,7 +577,6 @@ class ChatActivity : invalidateOptionsMenu() checkShowCallButtons() - checkShowMessageInputView() checkLobbyState() updateRoomTimerHandler() } @@ -603,6 +602,9 @@ class ChatActivity : loadAvatarForStatusBar() setupSwipeToReply() setActionBarTitle() + + checkShowCallButtons() + checkLobbyState() updateRoomTimerHandler() val urlForChatting = ApiUtils.getUrlForChat(chatApiVersion, conversationUser?.baseUrl, roomToken) @@ -1892,12 +1894,12 @@ class ChatActivity : } else { binding.lobby.lobbyView.visibility = View.GONE binding.messagesListView.visibility = View.VISIBLE - binding.fragmentContainerActivityChat.visibility = View.VISIBLE + checkShowMessageInputView() } } else { binding.lobby.lobbyView.visibility = View.GONE binding.messagesListView.visibility = View.VISIBLE - binding.fragmentContainerActivityChat.visibility = View.VISIBLE + checkShowMessageInputView() } }