Fixes: NB#272599 - System banners should be prioritized over short ev…

…ent banners (a.k.a. notification previews) RevBy: Ran Nyman
sledges · Jul 25, 2011 · 924e89d · 924e89d
1 parent c64af5b
commit 924e89d
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,7 @@
 system-ui (1.1.2~1) unstable; urgency=low
 
   * [UNRELEASED]
+  * Fixes: NB#272599 - System banners should be prioritized over short event banners (a.k.a. notification previews)
 
  -- Vesa Halttunen <[email protected]>  Mon, 25 Jul 2011 15:03:45 +0300
 

diff --git a/src/systemui/notifications/notificationmanager.cpp b/src/systemui/notifications/notificationmanager.cpp
@@ -554,6 +554,24 @@ Notification::NotificationType NotificationManager::determineType(const Notifica
     return classStr == SYSTEM_EVENT_ID ? Notification::SystemEvent : Notification::ApplicationEvent;
 }
 
+int NotificationManager::insertPosition(const Notification &notification)
+{
+    int pos = 0;
+    const NotificationParameters parameters = notification.parameters();
+    if(parameters.value("class") != QString("system")) {
+        return waitQueue.size();
+    } else {
+        for(pos = 0; pos < waitQueue.count(); ++pos) {
+            if (waitQueue.at(pos).parameters().value("class") == QString("system")) {
+                continue;
+            } else {
+                return pos;
+            }
+        }
+        return pos;
+    }
+}
+
 void NotificationManager::submitNotification(const Notification &notification)
 {
     if (!notificationInProgress) {
@@ -570,7 +588,7 @@ void NotificationManager::submitNotification(const Notification &notification)
     } else {
         // Store new notification in the notification wait queue
         if ((uint)waitQueue.size() < maxWaitQueueSize) {
-            waitQueue.append(notification);
+            waitQueue.insert(insertPosition(notification), notification);
         }
     }
 }

diff --git a/src/systemui/notifications/notificationmanager.h b/src/systemui/notifications/notificationmanager.h
@@ -342,6 +342,9 @@ private slots:
     //! Whether store initialization is subsequent after initialization in boot
     bool subsequentStart;
 
+    //! Returns the position where notification should be inserted in the queue, depending upon type of notification
+    int insertPosition(const Notification &notification);
+
 #ifdef UNIT_TEST
     friend class Ut_NotificationManager;
 #endif

diff --git a/tests/ut_notificationmanager/ut_notificationmanager.cpp b/tests/ut_notificationmanager/ut_notificationmanager.cpp
@@ -1672,4 +1672,79 @@ void Ut_NotificationManager::testPruningNonPersistentNotificationsOnBoot()
     QCOMPARE(spy.count(), 1);
 }
 
+
+void Ut_NotificationManager::testSytemNotificationArePrepended()
+{
+    delete manager;
+    manager = new TestNotificationManager(-1);
+    QSignalSpy spy(manager, SIGNAL(notificationUpdated(Notification)));
+
+    NotificationParameters parameters0;
+    parameters0.add(IMAGE, "icon0");
+    uint idnotification = manager->addNotification(0, parameters0);
+
+    NotificationParameters parameters1;
+    parameters1.add(BODY, "body1");
+    manager->addNotification(0, parameters1);
+
+    NotificationParameters parameters2;
+    parameters2.add(CLASS, "system");
+    uint idsystem = manager->addNotification(0, parameters2);
+
+    // Check that notification sink was signaled with one notification.
+    QCOMPARE(spy.count(), 1);
+    QList<QVariant> arguments = spy.takeFirst();
+    Notification n = qvariant_cast<Notification>(arguments.at(0));
+    QCOMPARE(n.notificationId(), idnotification);
+
+    // Relay next notification
+    manager->relayNextNotification();
+
+    QCOMPARE(spy.count(), 1);
+    arguments = spy.takeFirst();
+    n = qvariant_cast<Notification>(arguments.at(0));
+    // Inserting in order, application application system and expecting in order application system application
+    QCOMPARE(n.notificationId(), idsystem);
+}
+
+void Ut_NotificationManager::testSystemBannersWhenQueuedMaintainTheirOrder()
+{
+    delete manager;
+    manager = new TestNotificationManager(-1);
+    QSignalSpy spy(manager, SIGNAL(notificationUpdated(Notification)));
+
+    NotificationParameters parameters0;
+    parameters0.add(CLASS, "system");
+    uint idsystem0 = manager->addNotification(0, parameters0);
+
+    NotificationParameters parameters1;
+    parameters1.add(CLASS, "system");
+    uint idsystem1 = manager->addNotification(0, parameters1);
+
+    NotificationParameters parameters2;
+    parameters2.add(CLASS, "system");
+    uint idsystem2 = manager->addNotification(0, parameters2);
+
+    QCOMPARE(spy.count(), 1);
+    QList<QVariant> arguments = spy.takeFirst();
+    Notification n = qvariant_cast<Notification>(arguments.at(0));
+    QCOMPARE(n.notificationId(), idsystem0);
+
+    // Relay next notification
+    manager->relayNextNotification();
+
+    QCOMPARE(spy.count(), 1);
+    arguments = spy.takeFirst();
+    n = qvariant_cast<Notification>(arguments.at(0));
+    QCOMPARE(n.notificationId(), idsystem1);
+
+    // Relay next notification
+    manager->relayNextNotification();
+
+    QCOMPARE(spy.count(), 1);
+    arguments = spy.takeFirst();
+    n = qvariant_cast<Notification>(arguments.at(0));
+    QCOMPARE(n.notificationId(), idsystem2);
+}
+
 QTEST_MAIN(Ut_NotificationManager)
diff --git a/tests/ut_notificationmanager/ut_notificationmanager.h b/tests/ut_notificationmanager/ut_notificationmanager.h
@@ -140,6 +140,10 @@ private slots:
     void testRemovingGroupsWithEventType();
     // Test removal of unseen flags from notifications
     void testRemovalOfUnseenFlags();
+    // Test that system notifications are input always at the front of the queue
+    void testSytemNotificationArePrepended();
+    // Test when system banners are queued, they follow the order in which they are added
+    void testSystemBannersWhenQueuedMaintainTheirOrder();
 
     // Test that relevant signals are connected to the DBus sink
     void testDBusNotificationSinkConnections();