From 3201426886bd3b52fa4dcd44bee89f51801a8dd2 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Fri, 8 Aug 2025 10:44:36 +0200 Subject: [PATCH] Update room versions in security settings We need to come up with a better way of testing the versions here, but that's for different patch (cherry picked from commit 35b363fdcef94ba0e004c798cf9e1981ed2710aa) --- src/settings/RoomSecurityPage.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/settings/RoomSecurityPage.qml b/src/settings/RoomSecurityPage.qml index a18c1be34..e1f550a42 100644 --- a/src/settings/RoomSecurityPage.qml +++ b/src/settings/RoomSecurityPage.qml @@ -55,9 +55,9 @@ FormCard.FormCardPage { } FormCard.FormRadioDelegate { text: i18nc("@option:check", "Space members") - description: i18n("Anyone in the selected spaces can find and join.") + (!["8", "9", "10"].includes(room.version) ? `\n${needUpgradeRoom}` : "") + description: i18n("Anyone in the selected spaces can find and join.") + (!["8", "9", "10", "11", "12"].includes(room.version) ? `\n${needUpgradeRoom}` : "") checked: room.joinRule === JoinRule.Restricted - enabled: room.canSendState("m.room.join_rules") && ["8", "9", "10"].includes(room.version) + enabled: room.canSendState("m.room.join_rules") && ["8", "9", "10", "11", "12"].includes(room.version) onCheckedChanged: if (checked && room.joinRule != JoinRule.Restricted) { selectSpacesDialog.createObject(QQC2.Overlay.overlay).open(); } @@ -83,10 +83,10 @@ FormCard.FormCardPage { } FormCard.FormRadioDelegate { text: i18nc("@option:check", "Knock") - description: i18n("People not in the room need to request an invite to join the room.") + (!["7", "8", "9", "10"].includes(room.version) ? `\n${needUpgradeRoom}` : "") + description: i18n("People not in the room need to request an invite to join the room.") + (!["7", "8", "9", "10", "11", "12"].includes(room.version) ? `\n${needUpgradeRoom}` : "") checked: room.joinRule === JoinRule.Knock // https://spec.matrix.org/v1.4/rooms/#feature-matrix - enabled: room.canSendState("m.room.join_rules") && ["7", "8", "9", "10"].includes(room.version) + enabled: room.canSendState("m.room.join_rules") && ["7", "8", "9", "10", "11", "12"].includes(room.version) onCheckedChanged: if (checked && room.joinRule != JoinRule.Knock) { root.room.joinRule = JoinRule.Knock; }