Add default transport setting for assistant (assistant_default_transport).

Update SDK (5.3)
This commit is contained in:
Julien Wadel 2023-12-20 10:49:27 +01:00
parent 867cd16c40
commit da7410fa57
4 changed files with 20 additions and 2 deletions

View file

@ -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;

View file

@ -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);

View file

@ -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)
}
}
}

@ -1 +1 @@
Subproject commit 019d00d9e1b092964fc5266a3eea9dc0708d7f5b
Subproject commit 9bd7b11d47b09bcef967ef26885488cdb5b9f6f2