From c73bc8fc2905e439edd88998dfdc752cec30297a Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 16 Jul 2025 17:54:58 -0400
Subject: [PATCH] Redesign the enable encryption room setting

Clients like Element and ours show the room encryption mode as a toggle,
which in my opinion doesn't make sense. It's an irreversible operation,
so it should be a button!

When encryption is already used in the room, the button turns into a
non-interactive card.
---
 src/settings/RoomSecurityPage.qml | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/settings/RoomSecurityPage.qml b/src/settings/RoomSecurityPage.qml
index a18c1be34..dd589af89 100644
--- a/src/settings/RoomSecurityPage.qml
+++ b/src/settings/RoomSecurityPage.qml
@@ -25,13 +25,34 @@ FormCard.FormCardPage {
         title: i18nc("@option:check", "Encryption")
     }
     FormCard.FormCard {
-        FormCard.FormSwitchDelegate {
+        FormCard.AbstractFormDelegate {
+            visible: room.usesEncryption
+
+            contentItem: RowLayout {
+                spacing: Kirigami.Units.largeSpacing
+                Kirigami.Icon {
+                    source: "lock"
+                    width: Kirigami.Units.iconSizes.sizeForLabels
+                    height: Kirigami.Units.iconSizes.sizeForLabels
+                }
+                QQC2.Label {
+                    text: i18nc("@info", "This room uses encryption.")
+                    wrapMode: Text.WordWrap
+
+                    Layout.fillWidth: true
+                }
+            }
+        }
+        FormCard.FormButtonDelegate {
             id: enableEncryptionSwitch
-            text: i18n("Enable encryption")
-            description: i18nc("option:check", "Once enabled, encryption cannot be disabled.")
+
+            icon.name: "lock-symbolic"
+            text: i18nc("@action:button Enable encryption in this room", "Enable Encryption…")
+            description: i18nc("@info:description", "Once enabled, encryption cannot be disabled.")
             enabled: room.canEncryptRoom
-            checked: room.usesEncryption
-            onToggled: if (checked) {
+            visible: !room.usesEncryption
+
+            onClicked: {
                 let dialog = confirmEncryptionDialog.createObject(QQC2.Overlay.overlay, {
                     room: room
                 });