ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #244: Subscribe to the entire device namespace in nymea:cloud MQTT

pull/263/head
Jenkins nymea 2020-01-29 21:44:34 +01:00
parent 8b992870a3 7374652121
commit 56b0570231
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libnymea-core/cloud/awsconnector.cpp
View File

@ -164,14 +164,8 @@ void AWSConnector::onDeviceRegistered(bool needsReconnect)
void AWSConnector::setupSubscriptions()
{
// Subscribe to pairing info topics
QStringList subscriptions;
subscriptions.append(QString("%1/device/name/response").arg(m_clientId));
subscriptions.append(QString("%1/device/users/response").arg(m_clientId));
subscriptions.append(QString("%1/pair/response").arg(m_clientId));
subscriptions.append(QString("%1/notify/response").arg(m_clientId));
subscriptions.append(QString("%1/notify/info/endpoint").arg(m_clientId));
subscribe(subscriptions);
// Subscribe to our namespace
subscribe({QString("%1/#").arg(m_clientId)});
// fetch previous pairings
fetchPairings();
@ -194,14 +188,6 @@ void AWSConnector::onPairingsRetrieved(const QVariantMap &pairings)
}
qCDebug(dcAWS) << pairings.value("users").toList().count() << "devices paired in cloud.";
if (pairings.value("users").toList().count() > 0) {
QStringList topics;
foreach (const QVariant &pairing, pairings.value("users").toList()) {
topics << QString("%1/%2/#").arg(m_clientId).arg(pairing.toString());
}
subscribe(topics);
}
qCDebug(dcAWS) << pairings.value("pushNotificationsEndpoints").toList().count() << "push notification enabled users paired in cloud.";
QList<PushNotificationsEndpoint> pushNotificationEndpoints;
if (pairings.value("pushNotificationsEndpoints").toList().count() > 0) {
@ -429,7 +415,7 @@ void AWSConnector::onPublishReceived(const QString &topic, const QByteArray &pay
if (jsonDoc.toVariant().toMap().value("status").toInt() == 200) {
storeSyncedNameCache(m_clientName);
}
} else if (topic.startsWith(QString("%1/eu-west-1:").arg(m_clientId)) && topic.contains("proxy")) {
} else if (topic.startsWith(QString("%1/").arg(m_clientId)) && topic.contains("proxy")) {
QString token = jsonDoc.toVariant().toMap().value("token").toString();
QString timestamp = jsonDoc.toVariant().toMap().value("timestamp").toString();
QString serverUrl = jsonDoc.toVariant().toMap().value("serverUrl").toString();