Fixes: NB#276863 - [TASK] Notifications timestamps and sorting in loc…

…k screen.

RevBy: Vesa Halttunen

Details: Introduces a new dbus API for adding, removing and updating notifications.
Old dbus API for notifications is deprecated.

src/libnotificationsystem/genericnotificationparameterfactory.h

@@ -71,6 +71,13 @@ class GenericNotificationParameterFactory
         return QString("identifier");
     }
 
+    /*!
+     * Returns keyname of the timestamp parameter
+     */
+    static QString timestampKey() {
+        return QString("timestamp");
+    }
+
     /*!
      * Creates a NotificationParameter with the given event type.
      *
@@ -130,6 +137,16 @@ class GenericNotificationParameterFactory
     static NotificationParameter createIdentifierParameter(const QString &identifier) {
         return NotificationParameter(identifierKey(), QVariant(identifier));
     }
+
+    /*!
+     * Creates a NotificationParameter with timestamp value
+     *
+     * \param timestamp timestamp parameter of notification
+     * \return the related NotificationParameter
+     */
+    static NotificationParameter createTimestampParameter(uint timestamp) {
+        return NotificationParameter(timestampKey(), QVariant(timestamp));
+    }
 };
 
 #endif // GENERICNOTIFICATIONPARAMETERFACTORY_H

src/libnotificationsystem/notification.cpp

@@ -86,7 +86,6 @@ int Notification::timeout() const
     return timeout_;
 }
 
-
 QDataStream &operator<<(QDataStream &datastream, const Notification &notification)
 {
     datastream << notification.notificationId_;

src/libnotificationsystem/notification.h

@@ -123,7 +123,6 @@ class Notification
      */
     int timeout() const;
 
-
     friend QDataStream &operator<<(QDataStream &, const Notification &);
     friend QDataStream &operator>>(QDataStream &, Notification &);
 

src/libnotificationsystem/notificationgroup.cpp

@@ -65,7 +65,6 @@ void NotificationGroup::updateParameters(const NotificationParameters &parameter
     parameters_.update(parameters);
 }
 
-
 QDataStream &operator<<(QDataStream &datastream, const NotificationGroup &notificationGroup)
 {
     datastream << notificationGroup.groupId_;

src/systemui/notifications/dbusinterfacenotificationsource.cpp

@@ -20,6 +20,8 @@
 #include "dbusinterfacenotificationsource.h"
 #include "dbusinterfacenotificationsourceadaptor.h"
 #include "mnotificationproxy.h"
+#include "notificationwidgetparameterfactory.h"
+#include "genericnotificationparameterfactory.h"
 
 Q_DECLARE_METATYPE(MNotificationProxy)
 Q_DECLARE_METATYPE(MNotificationWithIdentifierProxy)
@@ -29,6 +31,11 @@ Q_DECLARE_METATYPE(QList<MNotificationProxy>)
 Q_DECLARE_METATYPE(QList<MNotificationWithIdentifierProxy>)
 Q_DECLARE_METATYPE(QList<MNotificationGroupProxy>)
 Q_DECLARE_METATYPE(QList<MNotificationGroupWithIdentifierProxy>)
+Q_DECLARE_METATYPE(QList<NotificationParameters>)
+Q_DECLARE_METATYPE(MNotificationProxyWithParameters)
+Q_DECLARE_METATYPE(QList<MNotificationProxyWithParameters>)
+Q_DECLARE_METATYPE(MNotificationGroupProxyWithParameters)
+Q_DECLARE_METATYPE(QList<MNotificationGroupProxyWithParameters>)
 
 DBusInterfaceNotificationSource::DBusInterfaceNotificationSource(NotificationManagerInterface &interface)
     : NotificationSource(interface)
@@ -46,6 +53,11 @@ DBusInterfaceNotificationSource::DBusInterfaceNotificationSource(NotificationMan
     qDBusRegisterMetaType<QList<MNotificationGroupProxy> >();
     qDBusRegisterMetaType<MNotificationGroupWithIdentifierProxy>();
     qDBusRegisterMetaType<QList<MNotificationGroupWithIdentifierProxy> >();
+    qDBusRegisterMetaType<QList<NotificationParameters> >();
+    qDBusRegisterMetaType<MNotificationProxyWithParameters>();
+    qDBusRegisterMetaType<QList<MNotificationProxyWithParameters> >();
+    qDBusRegisterMetaType<MNotificationGroupProxyWithParameters>();
+    qDBusRegisterMetaType<QList<MNotificationGroupProxyWithParameters> >();
 
     new DBusInterfaceNotificationSourceAdaptor(this);
 }
@@ -178,3 +190,45 @@ uint DBusInterfaceNotificationSource::notificationCountInGroup(uint notification
 {
     return manager.notificationCountInGroup(notificationUserId, groupId);
 }
+
+uint DBusInterfaceNotificationSource::addNotification(uint notificationUserId, uint groupId, const NotificationParameters &parameters)
+{
+    return manager.addNotification(notificationUserId, parameters, groupId);
+}
+
+bool DBusInterfaceNotificationSource::updateNotification(uint notificationUserId, uint notificationId, const NotificationParameters &parameters)
+{
+    return manager.updateNotification(notificationUserId, notificationId, parameters);
+}
+
+uint DBusInterfaceNotificationSource::addGroup(uint notificationUserId, const NotificationParameters &parameters)
+{
+    return manager.addGroup(notificationUserId, parameters);
+}
+
+bool DBusInterfaceNotificationSource::updateGroup(uint notificationUserId, uint groupId, const NotificationParameters &parameters)
+{
+    return manager.updateGroup(notificationUserId, groupId, parameters);
+}
+
+QList<MNotificationProxyWithParameters> DBusInterfaceNotificationSource::notificationListWithNotificationParameters(uint notificationUserId)
+{
+    QList<MNotificationProxyWithParameters> userNotifications;
+
+    foreach (const Notification &notification, manager.notificationList(notificationUserId)) {
+        userNotifications.append(MNotificationProxyWithParameters(notification));
+    }
+
+    return userNotifications;
+}
+
+QList<MNotificationGroupProxyWithParameters> DBusInterfaceNotificationSource::notificationGroupListWithNotificationParameters(uint notificationUserId)
+{
+    QList<MNotificationGroupProxyWithParameters> userGroups;
+
+    foreach (const NotificationGroup &group, manager.notificationGroupList(notificationUserId)) {
+        userGroups.append(MNotificationGroupProxyWithParameters(group));
+    }
+
+    return userGroups;
+}