From 2d2fd4ee34fef27ece62e67f8f592ee6cdb2666d Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 13 Apr 2017 10:55:00 +0200
Subject: [PATCH] feat(src/components/settings/AccountSettingsModel): simplify
 proxy config

---
 linphone-desktop/assets/languages/en.ts                   | 4 ----
 linphone-desktop/assets/languages/fr.ts                   | 4 ----
 .../src/components/settings/AccountSettingsModel.cpp      | 8 ++++++++
 .../ui/views/App/Settings/SettingsSipAccounts.qml         | 5 -----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index de7c52b5d..310b2a179 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -874,10 +874,6 @@ Server url not configured.</translation>
         <source></source>
         <translation></translation>
     </message>
-    <message>
-        <source>registerHeader</source>
-        <translation>Register</translation>
-    </message>
     <message>
         <source>eraseAllPasswords</source>
         <translation>ERASE PASSWORDS</translation>
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index 9f0792764..d56c7debb 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -874,10 +874,6 @@ Url du serveur non configurée.</translation>
         <source></source>
         <translation></translation>
     </message>
-    <message>
-        <source>registerHeader</source>
-        <translation>S&apos;enregistrer</translation>
-    </message>
     <message>
         <source>eraseAllPasswords</source>
         <translation>EFFACER MOTS DE PASSE</translation>
diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp
index be91d3eab..3b90b9c10 100644
--- a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp
+++ b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp
@@ -60,6 +60,8 @@ AccountSettingsModel::AccountSettingsModel (QObject *parent) : QObject(parent) {
 // -----------------------------------------------------------------------------
 
 bool AccountSettingsModel::addOrUpdateProxyConfig (const shared_ptr<linphone::ProxyConfig> &proxy_config) {
+  Q_ASSERT(proxy_config != nullptr);
+
   shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
 
   list<shared_ptr<linphone::ProxyConfig> > proxy_configs = core->getProxyConfigList();
@@ -107,11 +109,15 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
 }
 
 void AccountSettingsModel::setDefaultProxyConfig (const shared_ptr<linphone::ProxyConfig> &proxy_config) {
+  Q_ASSERT(proxy_config != nullptr);
+
   CoreManager::getInstance()->getCore()->setDefaultProxyConfig(proxy_config);
   emit accountSettingsUpdated();
 }
 
 void AccountSettingsModel::removeProxyConfig (const shared_ptr<linphone::ProxyConfig> &proxy_config) {
+  Q_ASSERT(proxy_config != nullptr);
+
   CoreManager::getInstance()->getCore()->removeProxyConfig(proxy_config);
   emit accountSettingsUpdated();
 }
@@ -120,6 +126,8 @@ bool AccountSettingsModel::addOrUpdateProxyConfig (
   const shared_ptr<linphone::ProxyConfig> &proxy_config,
   const QVariantMap &data
 ) {
+  Q_ASSERT(proxy_config != nullptr);
+
   QString literal = data["sipAddress"].toString();
 
   // Sip address.
diff --git a/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml b/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
index f4c378be6..6cebce569 100644
--- a/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
+++ b/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
@@ -71,7 +71,6 @@ TabContainer {
         legendLineWidth: SettingsWindowStyle.sipAccounts.legendLineWidth
 
         titles: [
-          qsTr('registerHeader'),
           qsTr('editionHeader'),
           qsTr('deleteHeader')
         ]
@@ -82,10 +81,6 @@ TabContainer {
           delegate: FormTableLine {
             title: modelData.sipAddress
 
-            FormTableEntry {
-              Switch {}
-            }
-
             FormTableEntry {
               ActionButton {
                 icon: 'edit'