ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #629: Drop cloud settings which aren't used any more

Browse Source
This commit is contained in:
jenkins 2023-02-21 17:43:45 +01:00
commit 4c29386bbd
7 changed files with 0 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libnymea-core/jsonrpc/configurationhandler.cpp
View File

@ -124,9 +124,6 @@ ConfigurationHandler::ConfigurationHandler(QObject *parent):
returns.insert("tunnelProxyServerConfigurations", tunnelProxyServerConfigurations);
QVariantList mqttServerConfigurations;
mqttServerConfigurations.append(objectRef<ServerConfiguration>());
QVariantMap cloudConfiguration;
cloudConfiguration.insert("enabled", enumValueName(Bool));
returns.insert("cloud", cloudConfiguration);
registerMethod("GetConfigurations", description, params, returns, Types::PermissionScopeNone);
params.clear(); returns.clear();
@ -201,12 +198,6 @@ ConfigurationHandler::ConfigurationHandler(QObject *parent):
returns.insert("configurationError", enumRef<NymeaConfiguration::ConfigurationError>());
registerMethod("DeleteWebServerConfiguration", description, params, returns);
params.clear(); returns.clear();
description = "Sets whether the cloud connection is enabled or disabled in the settings.";
params.insert("enabled", enumValueName(Bool));
returns.insert("configurationError", enumRef<NymeaConfiguration::ConfigurationError>());
registerMethod("SetCloudEnabled", description, params, returns);
// MQTT
params.clear(); returns.clear();
description = "Get all MQTT Server configurations.";
@ -303,11 +294,6 @@ ConfigurationHandler::ConfigurationHandler(QObject *parent):
params.insert("id", enumValueName(String));
registerNotification("WebServerConfigurationRemoved", description, params);
params.clear(); returns.clear();
description = "Emitted whenever the cloud configuration is changed.";
params.insert("cloudConfiguration", cloudConfiguration);
registerNotification("CloudConfigurationChanged", description, params);
params.clear(); returns.clear();
description = "Emitted whenever a MQTT broker policy is changed.";
params.insert("policy", objectRef<MqttPolicy>());
@ -335,7 +321,6 @@ ConfigurationHandler::ConfigurationHandler(QObject *parent):
connect(NymeaCore::instance()->configuration(), &NymeaConfiguration::mqttServerConfigurationRemoved, this, &ConfigurationHandler::onMqttServerConfigurationRemoved);
connect(NymeaCore::instance()->configuration(), &NymeaConfiguration::mqttPolicyChanged, this, &ConfigurationHandler::onMqttPolicyChanged);
connect(NymeaCore::instance()->configuration(), &NymeaConfiguration::mqttPolicyRemoved, this, &ConfigurationHandler::onMqttPolicyRemoved);
connect(NymeaCore::instance()->configuration(), &NymeaConfiguration::cloudEnabledChanged, this, &ConfigurationHandler::onCloudConfigurationChanged);
}
/*! Returns the name of the \l{ConfigurationHandler}. In this case \b Configuration.*/
@ -374,10 +359,6 @@ JsonReply *ConfigurationHandler::GetConfigurations(const QVariantMap &params) co
}
returns.insert("tunnelProxyServerConfigurations", tunnelProxyServerConfigs);
QVariantMap cloudConfig;
cloudConfig.insert("enabled", NymeaCore::instance()->configuration()->cloudEnabled());
returns.insert("cloud", cloudConfig);
return createReply(returns);
}
@ -634,13 +615,6 @@ JsonReply *ConfigurationHandler::DeleteMqttPolicy(const QVariantMap &params) con
return createReply(statusToReply(success ? NymeaConfiguration::ConfigurationErrorNoError : NymeaConfiguration::ConfigurationErrorInvalidId));
}
JsonReply *ConfigurationHandler::SetCloudEnabled(const QVariantMap &params) const
{
bool enabled = params.value("enabled").toBool();
NymeaCore::instance()->configuration()->setCloudEnabled(enabled);
return createReply(statusToReply(NymeaConfiguration::ConfigurationErrorNoError));
}
JsonReply *ConfigurationHandler::SetDebugServerEnabled(const QVariantMap &params) const
{
bool enabled = params.value("enabled").toBool();
@ -771,16 +745,6 @@ QVariantMap ConfigurationHandler::statusToReply(NymeaConfiguration::Configuratio
return returns;
}
void ConfigurationHandler::onCloudConfigurationChanged(bool enabled)
{
qCDebug(dcJsonRpc()) << "Notification: cloud configuration changed";
QVariantMap params;
QVariantMap cloudConfiguration;
cloudConfiguration.insert("enabled", enabled);
params.insert("cloudConfiguration", cloudConfiguration);
emit CloudConfigurationChanged(params);
}
void ConfigurationHandler::onLanguageChanged()
{
qCDebug(dcJsonRpc()) << "Notification: language configuration changed";

2
libnymea-core/jsonrpc/configurationhandler.h
View File

@ -53,7 +53,6 @@ public:
Q_INVOKABLE JsonReply *SetTimeZone(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetLanguage(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetDebugServerEnabled(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetCloudEnabled(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetTcpServerConfiguration(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *DeleteTcpServerConfiguration(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetWebServerConfiguration(const QVariantMap &params) const;
@ -92,7 +91,6 @@ signals:
private slots:
void onBasicConfigurationChanged();
void onLanguageChanged();
void onCloudConfigurationChanged(bool enabled);
void onTcpServerConfigurationChanged(const QString &id);
void onTcpServerConfigurationRemoved(const QString &id);
void onWebServerConfigurationChanged(const QString &id);

74
libnymea-core/nymeaconfiguration.cpp
View File

@ -455,80 +455,6 @@ void NymeaConfiguration::setBluetoothServerEnabled(bool enabled)
emit bluetoothServerEnabledChanged();
}
bool NymeaConfiguration::cloudEnabled() const
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
return settings.value("enabled", false).toBool();
}
void NymeaConfiguration::setCloudEnabled(bool enabled)
{
if (cloudEnabled() != enabled) {
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
settings.setValue("enabled", enabled);
settings.endGroup();
emit cloudEnabledChanged(enabled);
}
}
QString NymeaConfiguration::cloudServerUrl() const
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
return settings.value("cloudServerUrl").toString();
}
void NymeaConfiguration::setCloudServerUrl(const QString &cloudServerUrl)
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
settings.setValue("cloudServerUrl", cloudServerUrl);
}
QString NymeaConfiguration::cloudCertificateCA() const
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
return settings.value("cloudCertificateCA").toString();
}
void NymeaConfiguration::setCloudCertificateCA(const QString &cloudCertificateCA)
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
settings.setValue("cloudCertificateCA", cloudCertificateCA);
}
QString NymeaConfiguration::cloudCertificate() const
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
return settings.value("cloudCertificate").toString();
}
void NymeaConfiguration::setCloudCertificate(const QString &cloudCertificate)
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
settings.setValue("cloudCertificate", cloudCertificate);
}
QString NymeaConfiguration::cloudCertificateKey() const
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
return settings.value("cloudCertificateKey").toString();
}
void NymeaConfiguration::setCloudCertificateKey(const QString &cloudCertificateKey)
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);
settings.beginGroup("Cloud");
settings.setValue("cloudCertificateKey", cloudCertificateKey);
}
QString NymeaConfiguration::logDBDriver() const
{
NymeaSettings settings(NymeaSettings::SettingsRoleGlobal);

14
libnymea-core/nymeaconfiguration.h
View File

@ -188,19 +188,6 @@ public:
bool bluetoothServerEnabled() const;
void setBluetoothServerEnabled(bool enabled);
// Cloud
bool cloudEnabled() const;
void setCloudEnabled(bool enabled);
QString cloudServerUrl() const;
void setCloudServerUrl(const QString &cloudServerUrl);
QString cloudCertificateCA() const;
void setCloudCertificateCA(const QString &cloudCertificateCA);
QString cloudCertificate() const;
void setCloudCertificate(const QString &cloudCertificate);
QString cloudCertificateKey() const;
void setCloudCertificateKey(const QString &cloudCertificateKey);
// Logging
QString logDBDriver() const;
QString logDBName() const;
@ -256,7 +243,6 @@ signals:
void bluetoothServerEnabledChanged();
void mqttBrokerEnabledChanged();
void mqttPortChanged();
void cloudEnabledChanged(bool enabled);
void debugServerEnabledChanged(bool enabled);
};

13
libnymea-core/servermanager.cpp
View File

@ -219,7 +219,6 @@ ServerManager::ServerManager(Platform *platform, NymeaConfiguration *configurati
connect(configuration, &NymeaConfiguration::mqttPolicyRemoved, this, &ServerManager::mqttPolicyRemoved);
connect(configuration, &NymeaConfiguration::tunnelProxyServerConfigurationChanged, this, &ServerManager::tunnelProxyServerConfigurationChanged);
connect(configuration, &NymeaConfiguration::tunnelProxyServerConfigurationRemoved, this, &ServerManager::tunnelProxyServerConfigurationRemoved);
connect(configuration, &NymeaConfiguration::cloudEnabledChanged, this, &ServerManager::cloudEnabledChanged);
}
/*! Returns the pointer to the created \l{JsonRPCServer} in this \l{ServerManager}. */
@ -407,18 +406,6 @@ void ServerManager::tunnelProxyServerConfigurationRemoved(const QString &id)
server->deleteLater();
}
void ServerManager::cloudEnabledChanged(bool enabled)
{
qCDebug(dcServerManager()) << "Cloud connection" << (enabled ? "enabled. Starting tunnel proxy servers" : "disabled. Stopping tunnel proxy servers.");
foreach (TunnelProxyServer *server, m_tunnelProxyServers) {
if (enabled) {
server->startServer();
} else {
server->stopServer();
}
}
}
bool ServerManager::registerZeroConfService(const ServerConfiguration &configuration, const QString &serverType, const QString &serviceType)
{
// Note: reversed order

2
libnymea-core/servermanager.h
View File

@ -87,8 +87,6 @@ private slots:
void tunnelProxyServerConfigurationChanged(const QString &id);
void tunnelProxyServerConfigurationRemoved(const QString &id);
void cloudEnabledChanged(bool enabled);
private:
bool registerZeroConfService(const ServerConfiguration &configuration, const QString &serverType, const QString &serviceType);
void unregisterZeroConfService(const QString &configId, const QString &serverType);

21
tests/auto/api.json
View File

@ -659,9 +659,6 @@
"serverName": "String",
"serverUuid": "Uuid"
},
"cloud": {
"enabled": "Bool"
},
"tcpServerConfigurations": [
"$ref:ServerConfiguration"
],
@ -710,16 +707,6 @@
]
}
},
"Configuration.SetCloudEnabled": {
"description": "Sets whether the cloud connection is enabled or disabled in the settings.",
"params": {
"enabled": "Bool"
},
"permissionScope": "PermissionScopeAdmin",
"returns": {
"configurationError": "$ref:ConfigurationError"
}
},
"Configuration.SetDebugServerEnabled": {
"description": "Enable or disable the debug server.",
"params": {
@ -2297,14 +2284,6 @@
}
}
},
"Configuration.CloudConfigurationChanged": {
"description": "Emitted whenever the cloud configuration is changed.",
"params": {
"cloudConfiguration": {
"enabled": "Bool"
}
}
},
"Configuration.LanguageChanged": {
"description": "Emitted whenever the language of the server changed. The Plugins, Vendors and ThingClasses have to be reloaded to get the translated data.",
"params": {