mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Warn about room name and topic not being encrypted

Browse Source
pull/1815/head
Nicolas Werner 3 months ago
parent b86221bdbe
commit c1038a3e4a
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
3 changed files with 77 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 100
      resources/qml/dialogs/RoomSettingsDialog.qml
  2. 9
      src/ui/RoomSettings.cpp
  3. 2
      src/ui/RoomSettings.h

100
resources/qml/dialogs/RoomSettingsDialog.qml
Unescape View File

@ -130,7 +130,7 @@ ApplicationWindow {
color: palette.text
Layout.alignment: Qt.AlignHCenter
Layout.maximumWidth: parent.width - (Nheko.paddingSmall * 2) - nameChangeButton.anchors.leftMargin - (nameChangeButton.width * 2)
Layout.maximumWidth: parent.width - (Nheko.paddingSmall + roomNameButtons.anchors.leftMargin + roomNameButtons.implicitWidth) * 2
horizontalAlignment: TextEdit.AlignHCenter
wrapMode: TextEdit.Wrap
selectByMouse: true
@ -144,27 +144,43 @@ ApplicationWindow {
}
}
ImageButton {
id: nameChangeButton
visible: roomSettings.canChangeName
RowLayout {
id: roomNameButtons
anchors.leftMargin: Nheko.paddingSmall
anchors.left: roomName.right
anchors.verticalCenter: roomName.verticalCenter
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Change name of this room")
ToolTip.delay: Nheko.tooltipDelay
image: roomName.isNameEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg"
onClicked: {
if (roomName.isNameEditingAllowed) {
roomSettings.changeName(roomName.text);
roomName.isNameEditingAllowed = false;
} else {
roomName.isNameEditingAllowed = true;
roomName.focus = true;
roomName.selectAll();
ImageButton {
id: nameChangeButton
visible: roomSettings.canChangeName
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Change name of this room")
ToolTip.delay: Nheko.tooltipDelay
image: roomName.isNameEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg"
onClicked: {
if (roomName.isNameEditingAllowed) {
roomSettings.changeName(roomName.text);
roomName.isNameEditingAllowed = false;
} else {
roomName.isNameEditingAllowed = true;
roomName.focus = true;
roomName.selectAll();
}
}
}
EncryptionIndicator {
Layout.preferredHeight: 16
Layout.preferredWidth: 16
sourceSize.width: width
sourceSize.height: height
encrypted: true
visible: roomSettings.isEncryptionEnabled && (roomSettings.isRoomNameSet || !roomName.readOnly)
trust: Crypto.Unverified
ToolTip.text: qsTr("Since room state can't be encrypted, make sure no confidential information is stored in the room name!")
}
}
}
@ -220,26 +236,42 @@ ApplicationWindow {
}
ImageButton {
id: topicChangeButton
RowLayout {
spacing: Nheko.paddingMedium
Layout.alignment: Qt.AlignHCenter
visible: roomSettings.canChangeTopic
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Change topic of this room")
ToolTip.delay: Nheko.tooltipDelay
image: roomTopic.isTopicEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg"
onClicked: {
if (roomTopic.isTopicEditingAllowed) {
roomSettings.changeTopic(roomTopic.text);
roomTopic.isTopicEditingAllowed = false;
} else {
roomTopic.isTopicEditingAllowed = true;
roomTopic.showMore = true;
roomTopic.focus = true;
//roomTopic.selectAll();
ImageButton {
id: topicChangeButton
visible: roomSettings.canChangeTopic
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Change topic of this room")
ToolTip.delay: Nheko.tooltipDelay
image: roomTopic.isTopicEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg"
onClicked: {
if (roomTopic.isTopicEditingAllowed) {
roomSettings.changeTopic(roomTopic.text);
roomTopic.isTopicEditingAllowed = false;
} else {
roomTopic.isTopicEditingAllowed = true;
roomTopic.showMore = true;
roomTopic.focus = true;
//roomTopic.selectAll();
}
}
}
EncryptionIndicator {
Layout.preferredHeight: 16
Layout.preferredWidth: 16
sourceSize.width: width
sourceSize.height: height
encrypted: true
visible: roomSettings.isEncryptionEnabled && (roomSettings.plainRoomTopic != "" || !roomTopic.readOnly)
trust: Crypto.Unverified
ToolTip.text: qsTr("Since room state can't be encrypted, make sure no confidential information is stored in the room topic!")
}
}
Item {

9
src/ui/RoomSettings.cpp
Unescape View File

@ -81,6 +81,15 @@ RoomSettings::RoomSettings(QString roomid, QObject *parent)
this->allowedRoomsModel = new RoomSettingsAllowedRoomsModel(this);
}
bool
RoomSettings::isRoomNameSet() const
{
return !cache::client()
->getStateEvent<mtx::events::state::Name>(roomid_.toStdString())
.value_or(mtx::events::StateEvent<mtx::events::state::Name>{})
.content.name.empty();
}
QString
RoomSettings::roomName() const
{

2
src/ui/RoomSettings.h
Unescape View File

@ -100,6 +100,7 @@ class RoomSettings final : public QObject
Q_PROPERTY(bool supportsKnocking READ supportsKnocking CONSTANT)
Q_PROPERTY(bool supportsRestricted READ supportsRestricted CONSTANT)
Q_PROPERTY(bool supportsKnockRestricted READ supportsKnockRestricted CONSTANT)
Q_PROPERTY(bool isRoomNameSet READ isRoomNameSet NOTIFY roomNameChanged)
Q_PROPERTY(
QStringList allowedRooms READ allowedRooms WRITE setAllowedRooms NOTIFY allowedRoomsChanged)
Q_PROPERTY(RoomSettingsAllowedRoomsModel *allowedRoomsModel MEMBER allowedRoomsModel CONSTANT)
@ -128,6 +129,7 @@ public:
QString roomAvatarUrl();
int memberCount() const;
int notifications();
bool isRoomNameSet() const;
bool privateAccess() const;
bool guestAccess() const;
bool knockingEnabled() const;

Write Preview
Loading…
Cancel
Save