From 3f2afd2cfb3fb16c6988b1f166f208bb6a90e669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 6 Mar 2023 10:45:16 -0500
Subject: [PATCH] sip: remove useless switchbox
This option is fully replaced by sded media exchange and the switch
is only enabling the two next checkboxes
Change-Id: Ida4736fd6aa8e2a9c5327aa3bc4b236ecaa0a69e
---
src/app/constant/JamiStrings.qml | 1 -
.../components/AdvancedSIPSecuritySettings.qml | 15 ---------------
2 files changed, 16 deletions(-)
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index 4fd760c56..a8f93fd72 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -103,7 +103,6 @@ Item {
// AdvancedSIPSecuritySettings && AdvancedJamiSecuritySettings
property string security: qsTr("Security")
- property string encryptMediaStream: qsTr("Encrypt media streams (SRTP)")
property string enableSDES: qsTr("Enable SDES key exchange")
property string fallbackRTP: qsTr("Allow fallback on RTP")
property string encryptNegotiation: qsTr("Encrypt negotiation (TLS)")
diff --git a/src/app/settingsview/components/AdvancedSIPSecuritySettings.qml b/src/app/settingsview/components/AdvancedSIPSecuritySettings.qml
index 673ba8c22..b52d42e77 100644
--- a/src/app/settingsview/components/AdvancedSIPSecuritySettings.qml
+++ b/src/app/settingsview/components/AdvancedSIPSecuritySettings.qml
@@ -60,22 +60,9 @@ ColumnLayout {
Layout.fillWidth: true
Layout.leftMargin: JamiTheme.preferredMarginSize
- ToggleSwitch {
- id: encryptMediaStreamsToggle
-
- labelText: JamiStrings.encryptMediaStream
- fontPointSize: JamiTheme.settingsFontSize
-
- checked: CurrentAccount.enable_SRTP
-
- onSwitchToggled: CurrentAccount.enable_SRTP = checked
- }
-
ToggleSwitch {
id: enableSDESToggle
- enabled: CurrentAccount.enable_SRTP
-
labelText: JamiStrings.enableSDES
fontPointSize: JamiTheme.settingsFontSize
@@ -87,8 +74,6 @@ ColumnLayout {
ToggleSwitch {
id: fallbackRTPToggle
- enabled: CurrentAccount.enable_SRTP
-
labelText: JamiStrings.fallbackRTP
fontPointSize: JamiTheme.settingsFontSize
--
GitLab