Remove ifdefs for E2EE

This commit is contained in:
Tobias Fella
2023-08-07 22:38:25 +02:00
committed by Carl Schwan
parent 3ab04583ae
commit 67453d9fb8
11 changed files with 2 additions and 30 deletions

View File

@@ -162,10 +162,9 @@ QQC2.Control {
leftPadding: LayoutMirroring.enabled ? actionsRow.width : Kirigami.Units.largeSpacing
rightPadding: LayoutMirroring.enabled ? Kirigami.Units.largeSpacing : actionsRow.width + x * 2 + Kirigami.Units.largeSpacing * 2
placeholderText: readOnly ? i18n("This room is encrypted. Build libQuotient with encryption enabled to send encrypted messages.") : root.currentRoom.usesEncryption ? i18n("Send an encrypted message…") : root.currentRoom.chatBoxAttachmentPath.length > 0 ? i18n("Set an attachment caption...") : i18n("Send a message…")
placeholderText: root.currentRoom.usesEncryption ? i18n("Send an encrypted message…") : root.currentRoom.chatBoxAttachmentPath.length > 0 ? i18n("Set an attachment caption...") : i18n("Send a message…")
verticalAlignment: TextEdit.AlignVCenter
wrapMode: Text.Wrap
readOnly: (root.currentRoom.usesEncryption && !Controller.encryptionSupported)
Accessible.description: placeholderText

View File

@@ -27,7 +27,6 @@ Kirigami.ScrollablePage {
title: i18nc("@option:check", "Encryption")
}
MobileForm.FormCard {
visible: Controller.encryptionSupported
Layout.fillWidth: true
contentItem: ColumnLayout {
spacing: 0

View File

@@ -100,7 +100,7 @@ MobileForm.AbstractFormDelegate {
}
QQC2.ToolButton {
display: QQC2.AbstractButton.IconOnly
visible: Controller.encryptionSupported && deviceDelegate.showVerifyButton
visible: deviceDelegate.showVerifyButton
action: Kirigami.Action {
id: verifyDeviceAction
text: i18n("Verify device")

View File

@@ -287,8 +287,6 @@ Kirigami.ApplicationWindow {
Connections {
target: Controller.activeConnection
//TODO Remove this when the E2EE flag in libQuotient goes away
ignoreUnknownSignals: true
function onDirectChatAvailable(directChat) {
RoomManager.enterRoom(Controller.activeConnection.room(directChat.id));
}