mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 08:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View file

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