Merge pull request #2391 from nextcloud/fix-checking-lobby-state-from-chat-controller-while-in-a-call

Fix checking lobby state from chat controller while in a call
This commit is contained in:
Tim Krüger 2022-09-19 15:08:54 +02:00 committed by GitHub
commit 109124fb3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1822,6 +1822,12 @@ class ChatController(args: Bundle) :
activity?.findViewById<View>(R.id.toolbar)?.setOnClickListener(null)
}
checkingLobbyStatus = false
if (lobbyTimerHandler != null) {
lobbyTimerHandler?.removeCallbacksAndMessages(null)
}
if (conversationUser != null && isActivityNotChangingConfigurations() && isNotInCall()) {
ApplicationWideCurrentRoomHolder.getInstance().clear()
if (inConversation && validSessionId()) {
@ -1956,6 +1962,7 @@ class ChatController(args: Bundle) :
currentConversation?.sessionId
)
}
checkLobbyState()
if (isFirstMessagesProcessing) {
pullChatMessages(0)
} else {