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

Clean up warnings in code

Browse Source
This commit is contained in:
Michael Zanetti 2021-01-05 17:47:21 +01:00
parent 0549a42032
commit 293d435346
12 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.pri
View File

@ -1,6 +1,9 @@
CONFIG += c++11
#DEFINES += QT_DEPRECATED_WARNINGS
QMAKE_CXXFLAGS += -Wall
# We want -Wall to keep the code clean and tidy, however:
# On Windows, -Wall goes mental, so not using it there
# As of Qt 5.15, lots of things are deprecated inside Qt in preparation for Qt6 but no replacement to actually fix those yet.
!win32:QMAKE_CXXFLAGS += -Wall -Wno-deprecated-declarations -Wno-deprecated-copy
top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD)

3
libnymea-app/configuration/nymeaconfiguration.cpp
View File

@ -254,6 +254,7 @@ void NymeaConfiguration::deleteMqttPolicy(const QString &clientId)
void NymeaConfiguration::getConfigurationsResponse(int commandId, const QVariantMap &params)
{
Q_UNUSED(commandId)
// qDebug() << "have config reply" << params;
QVariantMap basicConfig = params.value("basicConfiguration").toMap();
m_debugServerEnabled = basicConfig.value("debugServerEnabled").toBool();
@ -344,6 +345,7 @@ void NymeaConfiguration::deleteWebSocketConfigReply(int commandId, const QVarian
void NymeaConfiguration::getMqttServerConfigsReply(int commandId, const QVariantMap &params)
{
Q_UNUSED(commandId)
m_mqttServerConfigurations->clear();
foreach (const QVariant &mqttServerVariant, params.value("mqttServerConfigurations").toList()) {
QVariantMap mqttConfigMap = mqttServerVariant.toMap();
@ -364,6 +366,7 @@ void NymeaConfiguration::deleteMqttConfigReply(int commandId, const QVariantMap
void NymeaConfiguration::getMqttPoliciesReply(int commandId, const QVariantMap &params)
{
Q_UNUSED(commandId)
// qDebug() << "Mqtt polices:" << params;
m_mqttPolicies->clear();
foreach (const QVariant &policyVariant, params.value("mqttPolicies").toList()) {

2
libnymea-app/connection/nymeaconnection.cpp
View File

@ -61,7 +61,7 @@ NymeaConnection::NymeaConnection(QObject *parent) : QObject(parent)
});
QGuiApplication *app = static_cast<QGuiApplication*>(QGuiApplication::instance());
QObject::connect(app, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState state) {
QObject::connect(app, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState /*state*/) {
// qDebug() << "Application state changed to:" << state;
updateActiveBearers();
});

1
libnymea-app/connection/nymeahosts.cpp
View File

@ -267,6 +267,7 @@ bool NymeaHostsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &s
hasReachableConnection |= m_jsonRpcClient->availableBearerTypes().testFlag(NymeaConnection::BearerTypeBluetooth);
break;
case Connection::BearerTypeUnknown:
case Connection::BearerTypeLoopback:
hasReachableConnection = true;
break;
case Connection::BearerTypeNone:

6
libnymea-app/connection/sigv4utils.cpp
View File

@ -76,7 +76,7 @@ QByteArray SigV4Utils::getCanonicalQueryString(const QNetworkRequest &request, c
{
QByteArray algorithm = "AWS4-HMAC-SHA256";
QByteArray dateTime = getCurrentDateTime();
QByteArray credentialScope = getCredentialScope(algorithm, dateTime, region, service);
QByteArray credentialScope = getCredentialScope(dateTime, region, service);
QByteArray canonicalQueryString;
canonicalQueryString += "X-Amz-Algorithm=AWS4-HMAC-SHA256";
@ -148,7 +148,7 @@ QByteArray SigV4Utils::getCanonicalRequest(QNetworkAccessManager::Operation oper
return canonicalRequest;
}
QByteArray SigV4Utils::getCredentialScope(const QByteArray &algorithm, const QByteArray &dateTime, const QByteArray &region, const QByteArray &service)
QByteArray SigV4Utils::getCredentialScope(const QByteArray &dateTime, const QByteArray &region, const QByteArray &service)
{
QByteArray credentialScope = dateTime.left(8) + '/' + region + '/' + service + "/aws4_request";
return credentialScope;
@ -157,7 +157,7 @@ QByteArray SigV4Utils::getCredentialScope(const QByteArray &algorithm, const QBy
QByteArray SigV4Utils::getStringToSign(const QByteArray &canonicalRequest, const QByteArray &dateTime, const QByteArray &region, const QByteArray &service)
{
QByteArray algorithm = "AWS4-HMAC-SHA256";
QByteArray credentialScope = getCredentialScope(algorithm, dateTime, region, service);
QByteArray credentialScope = getCredentialScope(dateTime, region, service);
QByteArray stringToSign = algorithm + '\n' + dateTime + '\n' + credentialScope + '\n' + QCryptographicHash::hash(canonicalRequest, QCryptographicHash::Sha256).toHex();
return stringToSign;

2
libnymea-app/connection/sigv4utils.h
View File

@ -50,7 +50,7 @@ public:
static QByteArray getCanonicalQueryString(const QNetworkRequest &request, const QByteArray &accessKeyId, const QByteArray &secretAccessKey, const QByteArray &sessionToken, const QByteArray &region, const QByteArray &service, const QByteArray &payload);
static QByteArray getCanonicalRequest(QNetworkAccessManager::Operation operation, const QNetworkRequest &request, const QByteArray &payload);
static QByteArray getCanonicalHeaders(const QNetworkRequest &request);
static QByteArray getCredentialScope(const QByteArray &algorithm, const QByteArray &dateTime, const QByteArray &region, const QByteArray &service);
static QByteArray getCredentialScope(const QByteArray &dateTime, const QByteArray &region, const QByteArray &service);
static QByteArray getStringToSign(const QByteArray &canonicalRequest, const QByteArray &dateTime, const QByteArray &region, const QByteArray &service);
static QByteArray getSignatureKey(const QByteArray &key, const QByteArray &date, const QByteArray &region, const QByteArray &service);
static QByteArray getSignature(const QByteArray &stringToSign, const QByteArray &secretAccessKey, const QByteArray &dateTime, const QString &region, const QString &service);

1
libnymea-app/models/logsmodelng.cpp
View File

@ -239,6 +239,7 @@ LogEntry *LogsModelNg::get(int index) const
void LogsModelNg::logsReply(int commandId, const QVariantMap &data)
{
Q_UNUSED(commandId)
int offset = data.value("offset").toInt();
int count = data.value("count").toInt();

1
libnymea-app/rulemanager.cpp
View File

@ -177,6 +177,7 @@ void RuleManager::getRulesReply(int /*commandId*/, const QVariantMap &params)
void RuleManager::getRuleDetailsReply(int commandId, const QVariantMap &params)
{
Q_UNUSED(commandId)
QVariantMap ruleMap = params.value("rule").toMap();
Rule* rule = m_rules->getRule(ruleMap.value("id").toUuid());
if (!rule) {

2
libnymea-app/system/systemcontroller.cpp
View File

@ -236,6 +236,7 @@ void SystemController::getUpdateStatusResponse(int /*commandId*/, const QVariant
void SystemController::getPackagesResponse(int commandId, const QVariantMap &data)
{
Q_UNUSED(commandId)
foreach (const QVariant &packageVariant, data.value("packages").toList()) {
QString id = packageVariant.toMap().value("id").toString();
QString displayName = packageVariant.toMap().value("displayName").toString();
@ -275,6 +276,7 @@ void SystemController::enableRepositoryResponse(int commandId, const QVariantMap
void SystemController::getServerTimeResponse(int commandId, const QVariantMap &params)
{
Q_UNUSED(commandId)
m_serverTime = QDateTime::fromSecsSinceEpoch(params.value("time").toUInt());
// NOTE: Ideally we'd just set the TimeZone of our serverTime prooperly, however, there's a bug on Android

6
nymea-app/nfcthingactionwriter.cpp
View File

@ -72,11 +72,6 @@ RuleActions *NfcThingActionWriter::actions() const
int NfcThingActionWriter::messageSize() const
{
return m_currentMessage.toByteArray().size();
int ret = 0;
for (int i = 0; i < m_currentMessage.size(); i++) {
ret += m_currentMessage.at(i).payload().size();
}
return ret;
}
NfcThingActionWriter::TagStatus NfcThingActionWriter::status() const
@ -155,6 +150,7 @@ void NfcThingActionWriter::targetDetected(QNearFieldTarget *target)
QDateTime startTime = QDateTime::currentDateTime();
qDebug() << "target detected";
connect(target, &QNearFieldTarget::error, this, [=](QNearFieldTarget::Error error, const QNearFieldTarget::RequestId &id){
Q_UNUSED(id)
qDebug() << "Tag error:" << error;
m_status = TagStatusFailed;
emit statusChanged();

2
nymea-app/nymea-app.pro
View File

@ -9,6 +9,8 @@ LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app
win32:Debug:LIBS += -L$$top_builddir/libnymea-app/debug
win32:Release:LIBS += -L$$top_builddir/libnymea-app/release
win32:CXX_FLAGS += /w
linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common
PRE_TARGETDEPS += ../libnymea-app

2
nymea-app/pushnotifications.cpp
View File

@ -107,7 +107,7 @@ QString PushNotifications::clientId() const
{
QString branding;
#if defined BRANDING
branding = "-" + BRANDING;
branding = QString("-%1").arg(BRANDING);
#endif
return PlatformHelper::instance()->deviceSerial() + "+io.guh.nymeaapp" + branding;
}