Merge pull request #4734 from nextcloud/bugfix/ensure-throttled-notifications-tray

Ensure that throttled notifications still appear in tray activity model
This commit is contained in:
Claudio Cambra 2022-07-25 14:08:22 +02:00 committed by GitHub
commit 7d9ffbc8a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -138,6 +138,7 @@ void User::slotBuildNotificationDisplay(const ActivityList &list)
// Set these activities as notified here, rather than in showDesktopNotification
for(const auto &activity : toNotifyList) {
_notifiedNotifications.insert(activity._id);
_activityModel->addNotificationToActivityList(activity);
}
return;
@ -146,6 +147,7 @@ void User::slotBuildNotificationDisplay(const ActivityList &list)
for(const auto &activity : toNotifyList) {
const auto message = activity._objectType == QStringLiteral("chat")
? activity._message : AccountManager::instance()->accounts().count() == 1 ? "" : activity._accName;
showDesktopNotification(activity._subject, message, activity._id); // We assigned the notif. id to the activity id
_activityModel->addNotificationToActivityList(activity);
}