Refactor and fix invitations

-Move invitation handling into RoomPage and delete InvitationPage -Open the new room after accepting the invitation
2021-02-02 01:52:09 +01:00
parent 465334e23f
commit 72907a1f18
7 changed files with 66 additions and 71 deletions
--- a/imports/NeoChat/Page/RoomListPage.qml
+++ b/imports/NeoChat/Page/RoomListPage.qml
@@ -96,13 +96,9 @@ Kirigami.ScrollablePage {
            action: Kirigami.Action {
                id: enterRoomAction
                onTriggered: {
-                    if (category === RoomType.Invited) {
-                        roomManager.openInvitation(currentRoom);
-                    } else {
-                        var roomItem = roomManager.enterRoom(currentRoom)
-                        roomListItem.KeyNavigation.right = roomItem
-                        roomItem.focus = true;
-                    }
+                    var roomItem = roomManager.enterRoom(currentRoom)
+                    roomListItem.KeyNavigation.right = roomItem
+                    roomItem.focus = true;
                }
            }