impl Marcel's review

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
nextcloud · Jun 5, 2024 · 1542a08 · 1542a08
1 parent ab34132
commit 1542a08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 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
@@ -547,20 +547,6 @@ class ChatActivity :
                     checkShowCallButtons()
                     checkShowMessageInputView()
                     checkLobbyState()
-
-                    if (!validSessionId()) {
-                        joinRoomWithPassword()
-                        chatViewModel.refreshChatParams(
-                            setupFieldsForPullChatMessages(
-                                false,
-                                0,
-                                false
-                            )
-                        )
-                    } else {
-                        Log.d(TAG, "already inConversation. joinRoomWithPassword is skipped")
-                    }
-
                     updateRoomTimerHandler()
                 }
 

diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
@@ -302,6 +302,8 @@ class ChatViewModel @Inject constructor(
 
                 override fun onNext(t: GenericOverall) {
                     _leaveRoomViewState.value = LeaveRoomSuccessState(funToCallWhenLeaveSuccessful)
+                    _getCapabilitiesViewState.value = GetCapabilitiesStartState
+                    _getRoomViewState.value = GetRoomStartState
                 }
             })
     }