diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index 8a2ee1ab4..7654375c3 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -3400,6 +3400,16 @@ Klikněte zde: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. Pokud je zadáno číslo, aplikuje se na něj předčíslí + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index cd4a84f6f..24dca77d0 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -3363,6 +3363,16 @@ Klik her: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index cfb708205..a4b52dee5 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -3363,6 +3363,16 @@ Klicken Sie hier: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 143cfb87f..0f57bf9ec 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -3388,6 +3388,16 @@ Click here: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. If a number is entered, apply the prefix to number + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + Advanced + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + Bundle mode + SettingsTunnel diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 16953639b..a0ccb5da7 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -3363,6 +3363,16 @@ Haga clic aquí: <a href="%1">%1 </a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index a132abd38..be5b4a48f 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -3363,6 +3363,16 @@ Cliquez ici : <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. Quand un nombre est saisi, applique le préfixe + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index a117ec8ef..bc4395b1c 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -3350,6 +3350,16 @@ Kattintson ide: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 5285dafe9..dfdad520b 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -3363,6 +3363,16 @@ Clicca: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index a127f11a7..94ff24de5 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -3350,6 +3350,16 @@ 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 5ed352c0d..ec665f764 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -3376,6 +3376,16 @@ Spustelėkite čia: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index e7a018520..e5f7558bb 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -3363,6 +3363,16 @@ Clique aqui: <a href="%1">%1 </a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. Se um número for inserido, aplique o prefixo ao número + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 688391ce0..44f507e3e 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -3376,6 +3376,16 @@ 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 1931536aa..9a44cc0cc 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -3363,6 +3363,16 @@ Klicka här: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index b4de956a3..c1c3326ff 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -3350,6 +3350,16 @@ Buraya tıklayın: <a href="%1">%1</a> 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 7da386180..41f037709 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -3376,6 +3376,16 @@ 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 8e94471c4..fe6d7165b 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -3350,6 +3350,16 @@ 'If a number is entered, apply the prefix to number' : tooltip for an option to applying the country prefix to numbers. + + advancedTitle + 'Advanced' : Option title for advanced option in account parameters. + + + + enableBundleMode + 'Bundle mode' : Option title to enable the RTP bundle mode. + + SettingsTunnel diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp index 3a966d54f..d5402d4c9 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp @@ -175,6 +175,7 @@ QVariantMap AccountSettingsModel::getAccountDescription (const shared_ptrgetInternationalPrefix()); map["dialPrefixCallChat"] = accountParams->getUseInternationalPrefixForCallsAndChats(); map["dialEscapePlus"] = accountParams->dialEscapePlusEnabled(); + map["rtpBundleEnabled"] = accountParams->rtpBundleEnabled(); shared_ptr natPolicy = accountParams->getNatPolicy(); bool createdNat = !natPolicy; @@ -183,6 +184,7 @@ QVariantMap AccountSettingsModel::getAccountDescription (const shared_ptriceEnabled(); map["turnEnabled"] = natPolicy->turnEnabled(); + const string &turnUser(natPolicy->getStunServerUsername()); const string &stunServer(natPolicy->getStunServer()); @@ -355,7 +357,7 @@ bool AccountSettingsModel::addOrUpdateAccount( if(data.contains("avpfInterval")) accountParams->setAvpfRrInterval(uint8_t(data["avpfInterval"].toInt())); if(data.contains("registerEnabled")) - accountParams->enableRegister(data.contains("registerEnabled") ? data["registerEnabled"].toBool() : true); + accountParams->enableRegister(data["registerEnabled"].toBool()); if(data.contains("publishPresence")) { newPublishPresence = accountParams->publishEnabled() != data["publishPresence"].toBool(); accountParams->enablePublish(data["publishPresence"].toBool()); @@ -372,6 +374,8 @@ bool AccountSettingsModel::addOrUpdateAccount( accountParams->setUseInternationalPrefixForCallsAndChats(data["dialPrefixCallChat"].toBool()); if(data.contains("dialEscapePlus")) accountParams->enableDialEscapePlus(data["dialEscapePlus"].toBool()); + if(data.contains("rtpBundleEnabled")) + accountParams->enableRtpBundle(data["rtpBundleEnabled"].toBool()); shared_ptr natPolicy = accountParams->getNatPolicy(); diff --git a/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js b/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js index 5944ef4ec..6d29db1c4 100644 --- a/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js +++ b/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js @@ -69,6 +69,8 @@ function initForm (account) { stunServer.text = config.stunServer turnPassword.text = config.turnPassword turnUser.text = config.turnUser + + rtpBundleEnabled.checked = config.rtpBundleEnabled if (account) { dialog._sipAddressOk = true @@ -107,7 +109,8 @@ function validAccount (account) { turnEnabled: turnEnabled.checked, stunServer: stunServer.text, turnUser: turnUser.text, - turnPassword: turnPassword.text + turnPassword: turnPassword.text, + rtpBundleEnabled: rtpBundleEnabled.checked } if (gAccount && Linphone.AccountSettingsModel.addOrUpdateAccount(gAccount, data) @@ -132,7 +135,9 @@ function handleVideoConferenceUriChanged (uri) { } function handleLimeServerUrlChanged (uri) { - dialog._limeServerUrlOk = uri=='' || Linphone.SipAddressesModel.addressIsValid(uri) + dialog._limeServerUrlOk = uri=='' || Linphone.SipAddressesModel.addressIsValid(uri) + if(!dialog._limeServerUrlOk) + console.log("Bad URI: " +uri) } function handleServerAddressChanged (address) { diff --git a/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml b/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml index e066c705a..52dc468f9 100644 --- a/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml +++ b/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml @@ -381,6 +381,28 @@ DialogPlus { } } } + // ----------------------------------------------------------------------- + // Advanced + // ----------------------------------------------------------------------- + + Form { + //: 'Advanced' : Option title for advanced option in account parameters. + title: qsTr('advancedTitle') + width: parent.width + + FormLine { + FormGroup { + //: 'Bundle mode' : Option title to enable the RTP bundle mode. + label: qsTr('enableBundleMode') + + Switch { + id: rtpBundleEnabled + + onClicked: checked = !checked + } + } + } + } } } }