From da7410fa5726dc94d50f96b7604c1cce4cc5c511 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 20 Dec 2023 10:49:27 +0100 Subject: [PATCH] Add default transport setting for assistant (assistant_default_transport). Update SDK (5.3) --- .../src/components/settings/SettingsModel.cpp | 11 +++++++++++ .../src/components/settings/SettingsModel.hpp | 6 ++++++ .../views/App/Main/Assistant/UseOtherSipAccount.qml | 3 ++- linphone-sdk | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 77db908db..d0ac4fe5c 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -248,6 +248,17 @@ void SettingsModel::setAssistantSupportsPhoneNumbers (bool status) { } } +int SettingsModel::getAssistantDefaultTransport() const { + return mConfig->getInt(UiSection, getEntryFullName(UiSection, "assistant_default_transport") , 2); +} + +void SettingsModel::setAssistantDefaultTransport(int transport) { + if(!isReadOnly(UiSection, "assistant_default_transport")) { + mConfig->setInt(UiSection, "assistant_default_transport", transport); + emit assistantSupportsPhoneNumbersChanged(transport); + } +} + bool SettingsModel::useWebview() const{ #ifdef ENABLE_APP_WEBVIEW return true; diff --git a/linphone-app/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp index 1da75a493..0d4f35821 100644 --- a/linphone-app/src/components/settings/SettingsModel.hpp +++ b/linphone-app/src/components/settings/SettingsModel.hpp @@ -55,6 +55,8 @@ class SettingsModel : public QObject { Q_PROPERTY(bool autoApplyProvisioningConfigUriHandlerEnabled READ getAutoApplyProvisioningConfigUriHandlerEnabled WRITE setAutoApplyProvisioningConfigUriHandlerEnabled NOTIFY autoApplyProvisioningConfigUriHandlerEnabledChanged) Q_PROPERTY(bool assistantSupportsPhoneNumbers READ getAssistantSupportsPhoneNumbers WRITE setAssistantSupportsPhoneNumbers NOTIFY assistantSupportsPhoneNumbersChanged) + Q_PROPERTY(int assistantDefaultTransport READ getAssistantDefaultTransport WRITE setAssistantDefaultTransport NOTIFY assistantDefaultTransportChanged) + // Webviews config Q_PROPERTY(QString assistantRegistrationUrl READ getAssistantRegistrationUrl WRITE setAssistantRegistrationUrl NOTIFY assistantRegistrationUrlChanged) Q_PROPERTY(QString assistantLoginUrl READ getAssistantLoginUrl WRITE setAssistantLoginUrl NOTIFY assistantLoginUrlChanged) @@ -307,6 +309,9 @@ public: bool getAssistantSupportsPhoneNumbers () const; void setAssistantSupportsPhoneNumbers (bool status); + int getAssistantDefaultTransport() const; + void setAssistantDefaultTransport(int transport);// 0:UDP, 1:TCP, 2:TLS + Q_INVOKABLE bool useWebview() const; QString getAssistantRegistrationUrl () const; @@ -739,6 +744,7 @@ signals: void autoApplyProvisioningConfigUriHandlerEnabledChanged(); void assistantSupportsPhoneNumbersChanged (bool status); + void assistantDefaultTransportChanged (int transport); void assistantRegistrationUrlChanged (QString url); void assistantLoginUrlChanged (QString url); diff --git a/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml index 30d16196a..9399d1451 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml @@ -165,7 +165,8 @@ import Common.Styles 1.0 ComboBox { id: transport model: [ 'UDP', 'TCP', 'TLS'] - currentIndex: 2 + currentIndex: SettingsModel.assistantDefaultTransport + onCurrentIndexChanged: console.log(currentIndex) } } } diff --git a/linphone-sdk b/linphone-sdk index 019d00d9e..9bd7b11d4 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 019d00d9e1b092964fc5266a3eea9dc0708d7f5b +Subproject commit 9bd7b11d47b09bcef967ef26885488cdb5b9f6f2