feat(SettingsSipAccountsEdit): give access to nat policy settings for one proxy config

assets/languages/en.ts

@@ -1386,6 +1386,34 @@ your friend&apos;s SIP address or username.</translation>
         <source>invalidRoute</source>
         <translation>Invalid route.</translation>
     </message>
+    <message>
+        <source>enableIceLabel</source>
+        <translation>Enable ICE</translation>
+    </message>
+    <message>
+        <source>stunServerLabel</source>
+        <translation>STUN/TURN server</translation>
+    </message>
+    <message>
+        <source>enableTurnLabel</source>
+        <translation>Enable TURN</translation>
+    </message>
+    <message>
+        <source>turnUserLabel</source>
+        <translation>TURN user</translation>
+    </message>
+    <message>
+        <source>turnPasswordLabel</source>
+        <translation>TURN password</translation>
+    </message>
+    <message>
+        <source>natAndFirewallTitle</source>
+        <translation>NAT and Firewall</translation>
+    </message>
+    <message>
+        <source>mainSipAccountSettingsTitle</source>
+        <translation>Main SIP account settings</translation>
+    </message>
 </context>
 <context>
     <name>SettingsUi</name>

assets/languages/fr_FR.ts

@@ -1384,6 +1384,34 @@ Cliquez ici : <a href="%1">%1</a>
         <source>invalidRoute</source>
         <translation>Route invalide.</translation>
     </message>
+    <message>
+        <source>enableIceLabel</source>
+        <translation>Activer ICE</translation>
+    </message>
+    <message>
+        <source>stunServerLabel</source>
+        <translation>Serveur STUN/TURN</translation>
+    </message>
+    <message>
+        <source>enableTurnLabel</source>
+        <translation>Activer TURN</translation>
+    </message>
+    <message>
+        <source>turnUserLabel</source>
+        <translation>Utilisateur TURN</translation>
+    </message>
+    <message>
+        <source>turnPasswordLabel</source>
+        <translation>Mot de passe TURN</translation>
+    </message>
+    <message>
+        <source>natAndFirewallTitle</source>
+        <translation>NAT et Pare-feu</translation>
+    </message>
+    <message>
+        <source>mainSipAccountSettingsTitle</source>
+        <translation>Paramètres principaux du compte SIP</translation>
+    </message>
 </context>
 <context>
     <name>SettingsUi</name>

assets/languages/ru.ts

@@ -1384,6 +1384,34 @@
         <source>invalidRoute</source>
         <translation>Неверный маршрут.</translation>
     </message>
+    <message>
+        <source>enableIceLabel</source>
+        <translation>Включить ICE</translation>
+    </message>
+    <message>
+        <source>stunServerLabel</source>
+        <translation>Сервер STUN/TURN</translation>
+    </message>
+    <message>
+        <source>enableTurnLabel</source>
+        <translation>Включить TURN</translation>
+    </message>
+    <message>
+        <source>turnUserLabel</source>
+        <translation>Пользователь TURN</translation>
+    </message>
+    <message>
+        <source>turnPasswordLabel</source>
+        <translation>Пароль TURN</translation>
+    </message>
+    <message>
+        <source>natAndFirewallTitle</source>
+        <translation>NAT и межсетевой экран</translation>
+    </message>
+    <message>
+        <source>mainSipAccountSettingsTitle</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsUi</name>

assets/languages/tr.ts

@@ -1386,6 +1386,34 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin.</translation>
         <source>invalidRoute</source>
         <translation>Geçersiz rota.</translation>
     </message>
+    <message>
+        <source>enableIceLabel</source>
+        <translation>ICE&apos;yi etkinleştir</translation>
+    </message>
+    <message>
+        <source>stunServerLabel</source>
+        <translation>STUN/TURN sunucusu</translation>
+    </message>
+    <message>
+        <source>enableTurnLabel</source>
+        <translation>TURN&apos;u etkinleştir</translation>
+    </message>
+    <message>
+        <source>turnUserLabel</source>
+        <translation>TURN kullanıcısı</translation>
+    </message>
+    <message>
+        <source>turnPasswordLabel</source>
+        <translation>TURN parolası</translation>
+    </message>
+    <message>
+        <source>natAndFirewallTitle</source>
+        <translation>NAT ve Güvenlik Duvarı</translation>
+    </message>
+    <message>
+        <source>mainSipAccountSettingsTitle</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsUi</name>

src/components/settings/AccountSettingsModel.cpp

@@ -96,7 +96,6 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
       ? ::Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString())
       : QString("");
   }
-
   map["serverAddress"] = ::Utils::coreStringToAppString(proxyConfig->getServerAddr());
   map["registrationDuration"] = proxyConfig->getPublishExpires();
   map["transport"] = ::Utils::coreStringToAppString(proxyConfig->getTransport());
@@ -108,6 +107,14 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
   map["avpfEnabled"] = proxyConfig->getAvpfMode() == linphone::AVPFMode::AVPFModeEnabled;
   map["registrationState"] = ::mapLinphoneRegistrationStateToUi(proxyConfig->getState());
 
+  shared_ptr<linphone::NatPolicy> natPolicy = proxyConfig->getNatPolicy();
+  map["iceEnabled"] = natPolicy->iceEnabled();
+  map["turnEnabled"] = natPolicy->turnEnabled();
+  map["stunServer"] = ::Utils::coreStringToAppString(natPolicy->getStunServer());
+  map["turnUser"] = ::Utils::coreStringToAppString(natPolicy->getStunServerUsername());
+  shared_ptr<const linphone::AuthInfo> authInfo = proxyConfig->findAuthInfo();
+  map["turnPassword"] = authInfo ? ::Utils::coreStringToAppString(authInfo->getPasswd()) : QString("");
+
   return map;
 }
 
@@ -172,6 +179,33 @@ bool AccountSettingsModel::addOrUpdateProxyConfig (
     : linphone::AVPFMode::AVPFModeDefault
   );
 
+  shared_ptr<linphone::NatPolicy> natPolicy = proxyConfig->getNatPolicy();
+  natPolicy->enableIce(data["iceEnabled"].toBool());
+  natPolicy->enableStun(data["iceEnabled"].toBool());
+  natPolicy->enableTurn(data["turnEnabled"].toBool());
+  natPolicy->setStunServer(::Utils::appStringToCoreString(data["stunServer"].toString()));
+  natPolicy->setStunServerUsername(::Utils::appStringToCoreString(data["turnUser"].toString()));
+
+  shared_ptr<const linphone::AuthInfo> authInfo = proxyConfig->findAuthInfo();
+  shared_ptr<linphone::Core> core = proxyConfig->getCore();
+  if (authInfo) {
+    shared_ptr<linphone::AuthInfo> clonedAuthInfo = authInfo->clone();
+    clonedAuthInfo->setPasswd(::Utils::appStringToCoreString(data["turnPassword"].toString()));
+
+    core->removeAuthInfo(authInfo);
+    core->addAuthInfo(clonedAuthInfo);
+  } else {
+    authInfo = linphone::Factory::get()->createAuthInfo(
+      ::Utils::appStringToCoreString(data["turnUser"].toString()),
+      ::Utils::appStringToCoreString(data["turnUser"].toString()),
+      ::Utils::appStringToCoreString(data["turnPassword"].toString()),
+      "",
+      "",
+      ""
+    );
+    core->addAuthInfo(authInfo);
+  }
+
   return addOrUpdateProxyConfig(proxyConfig);
 }
 

ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js

@@ -36,6 +36,11 @@ function initForm (account) {
   registerEnabled.checked = config.registerEnabled
   publishPresence.checked = config.publishPresence
   avpfEnabled.checked = config.avpfEnabled
+  iceEnabled.checked = config.iceEnabled
+  turnEnabled.checked = config.turnEnabled
+  stunServer.text = config.stunServer
+  turnPassword.text = config.turnPassword
+  turnUser.text = config.turnUser
 
   if (account) {
     dialog._sipAddressOk = true
@@ -62,7 +67,12 @@ function validProxyConfig () {
     avpfInterval: avpfInterval.text,
     registerEnabled: registerEnabled.checked,
     publishPresence: publishPresence.checked,
-    avpfEnabled: avpfEnabled.checked
+    avpfEnabled: avpfEnabled.checked,
+    iceEnabled: iceEnabled.checked,
+    turnEnabled: turnEnabled.checked,
+    stunServer: stunServer.text,
+    turnUser: turnUser.text,
+    turnPassword: turnPassword.text
   })) {
     dialog.exit(1)
   } else {
@@ -108,3 +118,5 @@ function handleTransportChanged (transport) {
     dialog._serverAddressOk = false
   }
 }
+
+// -----------------------------------------------------------------------------

ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml

@@ -42,8 +42,13 @@ DialogPlus {
 
   // ---------------------------------------------------------------------------
 
+  TabContainer {
+    Column {
+      width: parent.width
+
       Form {
-    anchors.fill: parent
+        title: qsTr('mainSipAccountSettingsTitle')
+        width: parent.width
 
         FormLine {
           FormGroup {
@@ -171,4 +176,74 @@ DialogPlus {
           }
         }
       }
+
+      // -----------------------------------------------------------------------
+      // NAT and Firewall.
+      // -----------------------------------------------------------------------
+
+      Form {
+        title: qsTr('natAndFirewallTitle')
+        width: parent.width
+
+        FormLine {
+          FormGroup {
+            label: qsTr('enableIceLabel')
+
+            Switch {
+              id: iceEnabled
+
+              onClicked: checked = !checked
+            }
+          }
+
+          FormGroup {
+            label: qsTr('stunServerLabel')
+
+            TextField {
+              id: stunServer
+
+              readOnly: !iceEnabled.checked
+            }
+          }
+        }
+
+        FormLine {
+          FormGroup {
+            label: qsTr('enableTurnLabel')
+
+            Switch {
+              id: turnEnabled
+
+              enabled: iceEnabled.checked
+
+              onClicked: checked = !checked
+            }
+          }
+
+          FormGroup {
+            label: qsTr('turnUserLabel')
+
+            TextField {
+              id: turnUser
+
+              readOnly: !turnEnabled.checked || !turnEnabled.enabled
+            }
+          }
+        }
+
+        FormLine {
+          FormGroup {}
+
+          FormGroup {
+            label: qsTr('turnPasswordLabel')
+
+            TextField {
+              id: turnPassword
+              readOnly: !turnEnabled.checked || !turnEnabled.enabled || !turnUser.text.length
+            }
+          }
+        }
+      }
+    }
+  }
 }

ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml

@@ -5,5 +5,5 @@ import QtQml 2.2
 
 QtObject {
   property int height: 550
-  property int width: 600
+  property int width: 934
 }