Merge branch 'jb50443' into 'master'

[lipstick] Remove handling of the x-nemo-hidden notification hint. Contributes to JB#50443 See merge request mer-core/lipstick!148
sailfishos · Aug 18, 2020 · be06414 · be06414
2 parents 645c9e3 + 0abda12
commit be06414
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 66 deletions.
diff --git a/src/notifications/lipsticknotification.cpp b/src/notifications/lipsticknotification.cpp
@@ -41,7 +41,6 @@ const char *LipstickNotification::HINT_REMOTE_ACTION_PREFIX = "x-nemo-remote-act
 const char *LipstickNotification::HINT_REMOTE_ACTION_ICON_PREFIX = "x-nemo-remote-action-icon-";
 const char *LipstickNotification::HINT_USER_REMOVABLE = "x-nemo-user-removable";
 const char *LipstickNotification::HINT_FEEDBACK = "x-nemo-feedback";
-const char *LipstickNotification::HINT_HIDDEN = "x-nemo-hidden";
 const char *LipstickNotification::HINT_DISPLAY_ON = "x-nemo-display-on";
 const char *LipstickNotification::HINT_SUPPRESS_DISPLAY_ON = "x-nemo-suppress-display-on";
 const char *LipstickNotification::HINT_ORIGIN = "x-nemo-origin";
@@ -309,11 +308,6 @@ bool LipstickNotification::isUserRemovableByHint() const
     return (m_hints.value(LipstickNotification::HINT_USER_REMOVABLE, QVariant(true)).toBool());
 }
 
-bool LipstickNotification::hidden() const
-{
-    return m_hints.value(LipstickNotification::HINT_HIDDEN, QVariant(false)).toBool();
-}
-
 QVariantList LipstickNotification::remoteActions() const
 {
     QVariantList rv;
@@ -456,7 +450,6 @@ void LipstickNotification::updateHintValues()
             hint.compare(LipstickNotification::HINT_PRIORITY, Qt::CaseInsensitive) != 0 &&
             hint.compare(LipstickNotification::HINT_CATEGORY, Qt::CaseInsensitive) != 0 &&
             hint.compare(LipstickNotification::HINT_USER_REMOVABLE, Qt::CaseInsensitive) != 0 &&
-            hint.compare(LipstickNotification::HINT_HIDDEN, Qt::CaseInsensitive) != 0 &&
             hint.compare(LipstickNotification::HINT_ORIGIN, Qt::CaseInsensitive) != 0 &&
             hint.compare(LipstickNotification::HINT_OWNER, Qt::CaseInsensitive) != 0 &&
             hint.compare(LipstickNotification::HINT_MAX_CONTENT_LINES, Qt::CaseInsensitive) != 0 &&

diff --git a/src/notifications/lipsticknotification.h b/src/notifications/lipsticknotification.h
@@ -118,9 +118,6 @@ class LIPSTICK_EXPORT LipstickNotification : public QObject
     //! Nemo hint: Feedback of the notification.
     static const char *HINT_FEEDBACK;
 
-    //! Nemo hint: Whether the notification is hidden.
-    static const char *HINT_HIDDEN;
-
     //! Nemo hint: Whether to turn the screen on when displaying preview
     static const char *HINT_DISPLAY_ON;
 
@@ -252,9 +249,6 @@ class LIPSTICK_EXPORT LipstickNotification : public QObject
     //! Returns the user removability hint state
     bool isUserRemovableByHint() const;
 
-    //! Returns true if the notification has been hidden to prevent further display
-    bool hidden() const;
-
     //! Returns the remote actions invokable by the notification
     QVariantList remoteActions() const;
 

diff --git a/src/notifications/notificationfeedbackplayer.cpp b/src/notifications/notificationfeedbackplayer.cpp
@@ -115,7 +115,7 @@ void NotificationFeedbackPlayer::removeNotification(uint id)
 
 bool NotificationFeedbackPlayer::isEnabled(LipstickNotification *notification, int minimumPriority)
 {
-    if (notification->hidden() || notification->restored())
+    if (notification->restored())
         return false;
 
     uint mode = AllNotificationsEnabled;

diff --git a/src/notifications/notificationlistmodel.cpp b/src/notifications/notificationlistmodel.cpp
@@ -153,5 +153,5 @@ void NotificationListModel::removeNotifications(const QList<uint> &ids)
 
 bool NotificationListModel::notificationShouldBeShown(LipstickNotification *notification)
 {
-    return !notification->hidden() && (!notification->body().isEmpty() || !notification->summary().isEmpty());
+    return !notification->body().isEmpty() || !notification->summary().isEmpty();
 }
diff --git a/src/notifications/notificationpreviewpresenter.cpp b/src/notifications/notificationpreviewpresenter.cpp
@@ -184,8 +184,7 @@ void NotificationPreviewPresenter::createWindowIfNecessary()
 
 bool NotificationPreviewPresenter::notificationShouldBeShown(LipstickNotification *notification)
 {
-    if (notification->hidden()
-            || notification->restored()
+    if (notification->restored()
             || (notification->previewBody().isEmpty() && notification->previewSummary().isEmpty())) {
         return false;
     }

diff --git a/tests/ut_notificationfeedbackplayer/ut_notificationfeedbackplayer.cpp b/tests/ut_notificationfeedbackplayer/ut_notificationfeedbackplayer.cpp
@@ -200,19 +200,6 @@ void Ut_NotificationFeedbackPlayer::testMultipleFeedbackIds()
     QCOMPARE(eventIds, QSet<quint32>() << 1 << 2);
 }
 
-void Ut_NotificationFeedbackPlayer::testHiddenNotification()
-{
-    // Create a notification
-    LipstickNotification *notification = createNotification(1);
-    QVariantHash hints(notification->hints());
-    hints.insert(LipstickNotification::HINT_HIDDEN, true);
-    notification->setHints(hints);
-    player->addNotification(1);
-
-    // Check that NGFAdapter::play() was not called for the feedback
-    QCOMPARE(gClientStub->stubCallCount("play"), 0);
-}
-
 void Ut_NotificationFeedbackPlayer::testNotificationSoundSuppressed()
 {
     gClientStub->stubSetReturnValue("play", (quint32)1);

diff --git a/tests/ut_notificationfeedbackplayer/ut_notificationfeedbackplayer.h b/tests/ut_notificationfeedbackplayer/ut_notificationfeedbackplayer.h
@@ -35,7 +35,6 @@ private slots:
     void testAddAndRemoveNotification();
     void testWithoutFeedbackId();
     void testMultipleFeedbackIds();
-    void testHiddenNotification();
     void testNotificationSoundSuppressed();
     void testUpdateNotification();
     void testUpdateNotificationAfterRestart();

diff --git a/tests/ut_notificationlistmodel/ut_notificationlistmodel.cpp b/tests/ut_notificationlistmodel/ut_notificationlistmodel.cpp
@@ -91,17 +91,6 @@ void Ut_NotificationListModel::testNotificationIsNotAddedIfNoSummaryOrBody()
     QCOMPARE(model.itemCount(), addItemCount);
 }
 
-void Ut_NotificationListModel::testNotificationIsNotAddedIfHidden()
-{
-    QVariantHash hints;
-    hints.insert(LipstickNotification::HINT_HIDDEN, true);
-    LipstickNotification notification("appName", "appName", 1, "appIcon", "summary", "body", QStringList() << "action", hints, 1);
-    gNotificationManagerStub->stubSetReturnValue("notificationIds", QList<uint>() << 1);
-    gNotificationManagerStub->stubSetReturnValue("notification", &notification);
-    NotificationListModel model;
-    QCOMPARE(model.itemCount(), 0);
-}
-
 void Ut_NotificationListModel::testAlreadyAddedNotificationIsRemovedIfNoLongerAddable()
 {
     LipstickNotification notification("appName", "appName", 1, "appIcon", "", "", QStringList() << "action", QVariantHash(), 1);

diff --git a/tests/ut_notificationlistmodel/ut_notificationlistmodel.h b/tests/ut_notificationlistmodel/ut_notificationlistmodel.h
@@ -28,7 +28,6 @@ private slots:
     void testNotificationIsOnlyAddedIfNotAlreadyAdded();
     void testNotificationIsNotAddedIfNoSummaryOrBody_data();
     void testNotificationIsNotAddedIfNoSummaryOrBody();
-    void testNotificationIsNotAddedIfHidden();
     void testAlreadyAddedNotificationIsRemovedIfNoLongerAddable();
     void testNotificationRemoval();
     void testNotificationOrdering();

diff --git a/tests/ut_notificationpreviewpresenter/ut_notificationpreviewpresenter.cpp b/tests/ut_notificationpreviewpresenter/ut_notificationpreviewpresenter.cpp
@@ -392,28 +392,6 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfNoSummaryOrBody(
     }
 }
 
-void Ut_NotificationPreviewPresenter::testNotificationNotShownIfHidden()
-{
-    NotificationPreviewPresenter presenter(screenLock, deviceLock);
-    QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
-
-    // Create notification
-    QVariantHash hints;
-    hints.insert(LipstickNotification::HINT_PREVIEW_SUMMARY, "previewSummary");
-    hints.insert(LipstickNotification::HINT_PREVIEW_BODY, "previewBody");
-    hints.insert(LipstickNotification::HINT_HIDDEN, true);
-    LipstickNotification *notification = new LipstickNotification("ut_notificationpreviewpresenter", "", 1, "", "", "", QStringList(), hints, -1);
-    notificationManagerNotification.insert(1, notification);
-    presenter.updateNotification(1);
-
-    QCOMPARE(changedSpy.count(), 0);
-    QCOMPARE(homeWindowVisible.isEmpty(), true);
-
-    // The notification should be considered presented
-    QCOMPARE(playedFeedbacks(), 1);
-    QCOMPARE(lastFeedbackId(), (uint)1);
-}
-
 void Ut_NotificationPreviewPresenter::testNotificationNotShownIfRestored()
 {
     NotificationPreviewPresenter presenter(screenLock, deviceLock);

diff --git a/tests/ut_notificationpreviewpresenter/ut_notificationpreviewpresenter.h b/tests/ut_notificationpreviewpresenter/ut_notificationpreviewpresenter.h
@@ -38,7 +38,6 @@ private slots:
     void testRemoveNotification();
     void testNotificationNotShownIfNoSummaryOrBody_data();
     void testNotificationNotShownIfNoSummaryOrBody();
-    void testNotificationNotShownIfHidden();
     void testNotificationNotShownIfRestored();
     void testShowingOnlyCriticalNotifications();
     void testUpdateNotificationRemovesNotificationFromQueueIfNotShowable();