commit ee3518105239049dd6653992ea29d622a396d931
author Olivier SOLDANO <olivier.soldano@savoirfairelinux.com> Fri Jul 07 08:34:41 2017 -0400
committer Olivier SOLDANO <olivier.soldano@savoirfairelinux.com> Tue Jul 11 12:04:36 2017 -0400
tree f00536c9f2cfc319afb53e3b5baea6589d5611c6
parent 6572a94aafd9ab6f456716c8f9bf596f2aa120c7

remove unused options in account configuration

in the security tab several checkbox where placed to configure
the encryption comportment, but none was either effective or
useful.

Change-Id: I1225c470052a764c0233cb94dfbc87cce902a9f1
Tuleap: #1627

accountdetails.cpp

diff --git a/accountdetails.cpp b/accountdetails.cpp
index 2f412b4..8ce4e04 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -58,21 +58,6 @@
 
     });
 
-    connect(ui->lrcfg_tlsEnabled, &QCheckBox::stateChanged, [=] (int state) {
-        if(state == Qt::Checked) {
-            ui->negoEncry_1->setVisible(currentAccount_->protocol() != Account::Protocol::RING);
-            ui->negoEncry_2->setVisible(true);
-            ui->defaultCipherCheckBox->setVisible(currentAccount_->protocol() != Account::Protocol::RING);
-            ui->cipherListView->setVisible(!ui->defaultCipherCheckBox->isChecked()
-                                           && currentAccount_->protocol() != Account::Protocol::RING);
-        } else {
-            ui->negoEncry_1->setVisible(false);
-            ui->negoEncry_2->setVisible(false);
-            ui->defaultCipherCheckBox->setVisible(false);
-            ui->cipherListView->setVisible(false);
-        }
-    });
-
     connect(ui->defaultCipherCheckBox, &QCheckBox::stateChanged, [=] (int state) {
         if (state == Qt::Checked) {
             ui->cipherListView->setVisible(false);
@@ -174,12 +159,12 @@
     certMap_[ui->lrcfg_tlsPrivateKeyCertificate->objectName()] = &currentAccount_->setTlsPrivateKey;
 #endif
 
-    ui->srtpEnabled->disconnect();
-    connect(ui->srtpEnabled, &QCheckBox::toggled, [=](bool checked) {
+    ui->srtpEnabledChkBox->disconnect();
+    connect(ui->srtpEnabledChkBox, &QCheckBox::toggled, [=](bool checked) {
         currentAccount_->setSrtpEnabled(checked);
     });
 
-    ui->srtpEnabled->setChecked(currentAccount_->isSrtpEnabled());
+    ui->srtpEnabledChkBox->setChecked(currentAccount_->isSrtpEnabled());
 
     if (currentAccount_->cipherModel()->useDefault())
         ui->defaultCipherCheckBox->setChecked(true);
@@ -195,31 +180,16 @@
 
     auto accountProtocol = currentAccount_->protocol();
     if (accountProtocol == Account::Protocol::RING) {
-        ui->medStreaEncry->setVisible(false);
-        ui->lrcfg_tlsEnabled->setVisible(false);
-
+        ui->srtpEnabledChkBox->hide();
         ui->nameServiceURLLabel->show();
         ui->lrcfg_nameServiceURL->show();
         ui->lrcfg_nameServiceURL->setText(currentAccount_->nameServiceURL());
     } else if (accountProtocol == Account::Protocol::SIP) {
-        ui->medStreaEncry->setVisible(true);
-        ui->lrcfg_tlsEnabled->setVisible(true);
-
+        ui->srtpEnabledChkBox->show();
         ui->nameServiceURLLabel->hide();
         ui->lrcfg_nameServiceURL->hide();
     }
 
-    if (ui->lrcfg_tlsEnabled->checkState() == Qt::Checked) {
-        ui->negoEncry_1->setVisible(true);
-        ui->negoEncry_2->setVisible(true);
-        ui->defaultCipherCheckBox->setVisible(currentAccount_->protocol() != Account::Protocol::RING);
-    } else {
-        ui->negoEncry_1->setVisible(false);
-        ui->negoEncry_2->setVisible(false);
-        ui->defaultCipherCheckBox->setVisible(false);
-        ui->cipherListView->setVisible(false);
-    }
-
     if (ui->defaultCipherCheckBox->checkState() == Qt::Checked)
         ui->cipherListView->setVisible(false);
     else