Added model signal for interactive notifications receive.

Signed-off-by: alex-z <[email protected]>
nextcloud · Sep 12, 2023 · b4b1c5f · b4b1c5f
1 parent 691f08d
commit b4b1c5f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
@@ -899,9 +899,12 @@ ApplicationWindow {
             onActivityItemClicked: {
                 model.slotTriggerDefaultAction(index)
             }
-            onCountChanged: {
-                if (contentY > 0) {
-                    newActivitiesButton.active = true;
+            Connections {
+                target: activityModel
+                onInteractiveActivityReceived: {
+                    if (activityList.contentY > 0) {
+                        newActivitiesButton.active = true;
+                    }
                 }
             }
         }

diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
@@ -636,6 +636,13 @@ void ActivityListModel::addNotificationToActivityList(const Activity &activity)
     qCDebug(lcActivity) << "Notification successfully added to the notification list: " << activity._subject;
     addEntriesToActivityList({activity});
     _notificationLists.prepend(activity);
+    for (const auto &link : activity._links) {
+        if (link._verb == QByteArrayLiteral("POST")
+            || link._verb == QByteArrayLiteral("REPLY")
+            || link._verb == QByteArrayLiteral("WEB")) {
+            emit interactiveActivityReceived();
+        }
+    }
 }
 
 void ActivityListModel::addSyncFileItemToActivityList(const Activity &activity)

diff --git a/src/gui/tray/activitylistmodel.h b/src/gui/tray/activitylistmodel.h
@@ -151,6 +151,8 @@ public slots:
     void activityJobStatusCode(int statusCode);
     void sendNotificationRequest(const QString &accountName, const QString &link, const QByteArray &verb, int row);
 
+    void interactiveActivityReceived();
+
 protected:
     [[nodiscard]] bool currentlyFetching() const;