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

Revert "add a hack for meeting the zapf deadline"

Browse Source 
This reverts commit 8df8d70535e08dcc949e7839f216a8a48bcb9f54.
This commit is contained in:
Michael Zanetti 2018-09-20 00:04:44 +02:00
parent ee8f8286a3
commit f243d383e4
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,9 +266,7 @@ int AWSConnector::sendPushNotification(const QString &userId, const QString &end
params.insert("title", title); params.insert("title", title);
params.insert("body", text); params.insert("body", text);
params.insert("timestamp", QDateTime::currentMSecsSinceEpoch()); params.insert("timestamp", QDateTime::currentMSecsSinceEpoch());
// publish(QString("%1/notify/user/%2/%3").arg(m_clientId, userId, endpointId), params); publish(QString("%1/notify/user/%2/%3").arg(m_clientId, userId, endpointId), params);
Q_UNUSED(userId)
publish(QString("%1/notify/user/%2").arg(m_clientId, endpointId), params);
return m_transactionId; return m_transactionId;
} }

33
libnymea-core/cloud/cloudnotifications.cpp
View File

@ -33,12 +33,6 @@ ParamTypeId notifyActionParamBodyId = ParamTypeId("4bd0fa87-c663-4621-8040-99b6d
StateTypeId connectedStateTypeId = StateTypeId("518e27b6-c3bf-49d7-be24-05ae978c00f7"); StateTypeId connectedStateTypeId = StateTypeId("518e27b6-c3bf-49d7-be24-05ae978c00f7");
// FIXME: This ZAPF_HOTFIX is here to disable some features in order to meet the ZAPF deadline
// Once the cloud infrastructure is fixed to properly give out unique and persistent ids
// for push notification enabled devices, remove this complete commit (apply -r)
// It should remove all the ZAPF_HOTFIX parts in here and one line in awsconnector.cpp
#define ZAPF_HOTFIX 1
CloudNotifications::CloudNotifications(AWSConnector* awsConnector, QObject *parent): CloudNotifications::CloudNotifications(AWSConnector* awsConnector, QObject *parent):
DevicePlugin(parent), DevicePlugin(parent),
m_awsConnector(awsConnector) m_awsConnector(awsConnector)
@ -169,27 +163,6 @@ DeviceManager::DeviceError CloudNotifications::executeAction(Device *device, con
void CloudNotifications::pushNotificationEndpointsUpdated(const QList<AWSConnector::PushNotificationsEndpoint> &endpoints) void CloudNotifications::pushNotificationEndpointsUpdated(const QList<AWSConnector::PushNotificationsEndpoint> &endpoints)
{ {
qCDebug(dcCloud()) << "Push Notification endpoint update"; qCDebug(dcCloud()) << "Push Notification endpoint update";
#if ZAPF_HOTFIX
if (endpoints.isEmpty() && myDevices().count() > 0) {
emit autoDeviceDisappeared(myDevices().first()->id());
return;
}
if (myDevices().count() > 0) {
// already have a device, ignore it
return;
}
DeviceDescriptor descriptor(cloudNotificationsDeviceClassId, "Push notifications", "");
ParamList params;
Param userIdParam(cloudNotificationsDeviceClassUserParamId, ""); // Not used for now
params.append(userIdParam);
Param endpointIdParam(cloudNotificationsDeviceClassEndpointParamId, "everyone");
params.append(endpointIdParam);
descriptor.setParams(params);
emit autoDevicesAppeared(cloudNotificationsDeviceClassId, {descriptor});
#else
QList<Device*> devicesToRemove; QList<Device*> devicesToRemove;
foreach (Device *configuredDevice, myDevices()) { foreach (Device *configuredDevice, myDevices()) {
bool found = false; bool found = false;
@ -231,14 +204,11 @@ void CloudNotifications::pushNotificationEndpointsUpdated(const QList<AWSConnect
} }
} }
emit autoDevicesAppeared(cloudNotificationsDeviceClassId, devicesToAdd); emit autoDevicesAppeared(cloudNotificationsDeviceClassId, devicesToAdd);
#endif
} }
void CloudNotifications::pushNotificationEndpointAdded(const AWSConnector::PushNotificationsEndpoint &endpoint) void CloudNotifications::pushNotificationEndpointAdded(const AWSConnector::PushNotificationsEndpoint &endpoint)
{ {
#if ZAPF_HOTFIX
pushNotificationEndpointsUpdated({endpoint});
#else
DeviceDescriptor descriptor(cloudNotificationsDeviceClassId, endpoint.displayName, QString("Send notifications to %1").arg(endpoint.displayName)); DeviceDescriptor descriptor(cloudNotificationsDeviceClassId, endpoint.displayName, QString("Send notifications to %1").arg(endpoint.displayName));
ParamList params; ParamList params;
Param userIdParam(cloudNotificationsDeviceClassUserParamId, endpoint.userId); Param userIdParam(cloudNotificationsDeviceClassUserParamId, endpoint.userId);
@ -247,7 +217,6 @@ void CloudNotifications::pushNotificationEndpointAdded(const AWSConnector::PushN
params.append(endpointIdParam); params.append(endpointIdParam);
descriptor.setParams(params); descriptor.setParams(params);
emit autoDevicesAppeared(cloudNotificationsDeviceClassId, {descriptor}); emit autoDevicesAppeared(cloudNotificationsDeviceClassId, {descriptor});
#endif
} }
void CloudNotifications::pushNotificationSent(int id, int status) void CloudNotifications::pushNotificationSent(int id, int status)