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

switch push system with config

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-19 23:13:23 +02:00
parent 3c7b1eb20d
commit b01b0bc97b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libnymea-app-core/connection/awsclient.cpp
View File

@ -49,6 +49,14 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
{ {
m_nam = new QNetworkAccessManager(this); m_nam = new QNetworkAccessManager(this);
#ifdef Q_OS_ANDROID
QString pushSystem = "GCM";
#elif defined Q_OS_IOS
QString pushSystem = "APNS";
#else
QString pushSystem = "";
#endif
AWSConfiguration config; AWSConfiguration config;
// Community environment // Community environment
config.clientId = "35duli0b13c7pet5k4bcv8pbu"; config.clientId = "35duli0b13c7pet5k4bcv8pbu";
@ -60,6 +68,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.mqttEndpoint = "a2d0ba9572wepp.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a2d0ba9572wepp.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "api-cloud.guh.io"; config.apiEndpoint = "api-cloud.guh.io";
config.pushNotificationSystem = pushSystem;
m_configs.append(config); m_configs.append(config);
// Testing environment // Testing environment
@ -72,6 +81,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.mqttEndpoint = "a2addxakg5juii.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a2addxakg5juii.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "testapi-cloud.guh.io"; config.apiEndpoint = "testapi-cloud.guh.io";
config.pushNotificationSystem = pushSystem == "APNS" ? pushSystem + "_SANDBOX" : pushSystem;
m_configs.append(config); m_configs.append(config);
// Marantec environment // Marantec environment
@ -85,6 +95,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.mqttEndpoint = "a27q7a2x15m8h3.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a27q7a2x15m8h3.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "api-cloud.guh.io"; config.apiEndpoint = "api-cloud.guh.io";
config.pushNotificationSystem = pushSystem;
m_configs.append(config); m_configs.append(config);
QSettings settings; QSettings settings;
@ -626,11 +637,7 @@ void AWSClient::registerPushNotificationEndpoint(const QString &registrationId,
QVariantMap payload; QVariantMap payload;
payload.insert("registrationId", registrationId); payload.insert("registrationId", registrationId);
#ifdef Q_OS_ANDROID payload.insert("channel", m_configs.at(m_usedConfigIndex).pushNotificationSystem);
payload.insert("channel", "GCM");
#else
payload.insert("channel", "APNS");
#endif
payload.insert("mobileDeviceDisplayName", deviceDisplayName); payload.insert("mobileDeviceDisplayName", deviceDisplayName);
payload.insert("mobileDeviceUuid", mobileDeviceId); payload.insert("mobileDeviceUuid", mobileDeviceId);
QJsonDocument jsonDoc = QJsonDocument::fromVariant(payload); QJsonDocument jsonDoc = QJsonDocument::fromVariant(payload);

1
libnymea-app-core/connection/awsclient.h
View File

@ -70,6 +70,7 @@ public:
QString mqttEndpoint; QString mqttEndpoint;
QString region; QString region;
QString apiEndpoint; QString apiEndpoint;
QString pushNotificationSystem;
}; };
class AWSClient : public QObject class AWSClient : public QObject