fix(cooperation): start new transfer requests with a fresh notification

Transfer notifications reused the previous notification id because every
call passes a non-empty hint map. After the user rejected a request or the
sender cancelled it, the old bubble was already dismissed (or still running
its close animation), so the next transfer request updated a notification
that was no longer visible and the receiver never saw it again until the
application restarted.

Make replacement explicit: only progress updates reuse the current id, all
new notifications start at replaces_id 0. Drop the id when a notification
is closed, acted upon, or fails to appear, so a stale id can never wedge
later notifications. Also log received transfer requests at warning level
to tell a missing RPC apart from a suppressed notification in field logs.

Add a regression test for the notification id lifecycle.

Log: start new transfer requests with a fresh notification
PMS: TASK-396845
Influence: a rejected or cancelled request no longer hides later transfer notifications until restart.

Author: re2zero

src/lib/cooperation/core/net/helper/transferhelper.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 - 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -129,15 +129,17 @@ void TransferHelperPrivate::reportTransferResult(bool result)
 #endif
 }
 
-void TransferHelperPrivate::notifyMessage(const QString &body, const QStringList &actions, int expireTimeout, const QVariantMap &hitMap)
+void TransferHelperPrivate::notifyMessage(const QString &body, const QStringList &actions, int expireTimeout,
+                                          const QVariantMap &hitMap, bool replaceExisting)
 {
 #ifdef __linux__
-    notice->notifyMessage(tr("File transfer"), body, actions, hitMap, expireTimeout);
+    notice->notifyMessage(tr("File transfer"), body, actions, hitMap, expireTimeout, replaceExisting);
 #else
     Q_UNUSED(body)
     Q_UNUSED(actions)
     Q_UNUSED(expireTimeout)
     Q_UNUSED(hitMap)
+    Q_UNUSED(replaceExisting)
     DLOG << "Non-Linux platform, skipping notification message";
 #endif
 }
@@ -365,7 +367,7 @@ void TransferHelper::updateProgress(int value, const QString &remainTime)
         QVariantMap hitMap { { "x-deepin-ShowInNotifyCenter", false } };
         QString msg(tr("File receiving %1% | Remaining time %2").arg(QString::number(value), remainTime));
 
-        d->notifyMessage(msg, actions, 15 * 1000, hitMap);
+        d->notifyMessage(msg, actions, 15 * 1000, hitMap, true);
         return;
     }
 #endif

src/lib/cooperation/core/net/helper/transferhelper_p.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -44,7 +44,8 @@ class TransferHelperPrivate : public QObject
     CooperationTransDialog *transDialog();
 
     void reportTransferResult(bool result);
-    void notifyMessage(const QString &body, const QStringList &actions, int expireTimeout, const QVariantMap &hitMap = QVariantMap());
+    void notifyMessage(const QString &body, const QStringList &actions, int expireTimeout,
+                       const QVariantMap &hitMap = QVariantMap(), bool replaceExisting = false);
     void initConnect();
     QVariantMap createViewFileHints(const QString &path);
 

src/lib/cooperation/core/net/linux/noticeutil.cpp

@@ -51,24 +51,54 @@ void NoticeUtil::onActionTriggered(uint replacesId, const QString &action)
         return;
     }
 
+    // Invoking an action dismisses the notification, so its id is no longer
+    // usable for follow-up updates.
+    recvNotifyId = 0;
     emit ActionInvoked(action);
 }
 
-void NoticeUtil::notifyMessage(const QString &title, const QString &body, const QStringList &actions, QVariantMap hitMap, int expireTimeout)
+void NoticeUtil::notifyMessage(const QString &title, const QString &body, const QStringList &actions,
+                               QVariantMap hitMap, int expireTimeout, bool replaceExisting)
 {
-    // If hitMap is not empty, use previous recvNotifyId for progress updates
-    uint notifyId = hitMap.isEmpty() ? 0 : recvNotifyId;
-    
-    QDBusReply<uint> reply = notifyIfc->call(QString("Notify"), QString("dde-cooperation"), notifyId,
+    uint notifyId = replaceExisting ? recvNotifyId : 0;
+    uint shownId = sendNotify(title, body, actions, hitMap, expireTimeout, notifyId);
+    if (shownId == 0) {
+        // Do not keep a stale id around: the next notification must be able to
+        // create a fresh bubble.
+        WLOG << "Failed to show notification, replaces_id:" << notifyId;
+        recvNotifyId = 0;
+        return;
+    }
+
+    recvNotifyId = shownId;
+}
+
+uint NoticeUtil::sendNotify(const QString &title, const QString &body, const QStringList &actions,
+                            const QVariantMap &hints, int expireTimeout, uint replacesId)
+{
+    QDBusReply<uint> reply = notifyIfc->call(QString("Notify"), QString("dde-cooperation"), replacesId,
                                              QString("dde-cooperation"), title, body,
-                                             actions, hitMap, expireTimeout);
+                                             actions, hints, expireTimeout);
+    if (!reply.isValid()) {
+        WLOG << "Notification D-Bus call failed:" << reply.error().message().toStdString();
+        return 0;
+    }
+
+    return reply.value();
+}
 
-    recvNotifyId = reply.value();
+void NoticeUtil::sendClose(uint notificationId)
+{
+    notifyIfc->call("CloseNotification", notificationId);
 }
 
 void NoticeUtil::closeNotification()
 {
-    notifyIfc->call("CloseNotification", recvNotifyId);
+    if (recvNotifyId == 0)
+        return;
+
+    sendClose(recvNotifyId);
+    recvNotifyId = 0;
 }
 
 void NoticeUtil::resetNotifyId()

src/lib/cooperation/core/net/linux/noticeutil.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -19,10 +19,22 @@ class NoticeUtil : public QObject
     explicit NoticeUtil(QObject *parent = nullptr);
     ~NoticeUtil();
 
-    void notifyMessage(const QString &title, const QString &body, const QStringList &actions, QVariantMap hitMap, int expireTimeout);
+    // replaceExisting must only be set for updates of a notification that is
+    // still on screen (transfer progress). A new notification always has to
+    // start with replaces_id 0, otherwise some notification daemons keep
+    // updating an already dismissed bubble and never show the new one.
+    void notifyMessage(const QString &title, const QString &body, const QStringList &actions,
+                       QVariantMap hitMap, int expireTimeout, bool replaceExisting = false);
     void closeNotification();
     void resetNotifyId();
 
+protected:
+    // Seams for tests, so the id lifecycle can be verified without a running
+    // notification daemon.
+    virtual uint sendNotify(const QString &title, const QString &body, const QStringList &actions,
+                            const QVariantMap &hints, int expireTimeout, uint replacesId);
+    virtual void sendClose(uint notificationId);
+
 Q_SIGNALS:
     void ActionInvoked(const QString &action);
     void onConfirmTimeout();

src/lib/cooperation/core/net/networkutil.cpp

@@ -106,6 +106,8 @@ NetworkUtilPrivate::NetworkUtilPrivate(NetworkUtil *qq)
             DLOG << "Handling APPLY_TRANS message";
             ApplyMessage req, res;
             req.from_json(json_value);
+            WLOG << "Received transfer request from:" << req.host << "nick:" << req.nick
+                 << "tunnel:" << req.tunnel;
             res.flag = DO_WAIT;
             *res_msg = res.as_json().serialize();
             confirmTargetAddress = QString::fromStdString(req.host);

tests/coop/CMakeLists.txt

@@ -56,6 +56,7 @@ add_executable(coop_tests ${COOP_SRC}
     ${CMAKE_CURRENT_SOURCE_DIR}/cooperationutil_test.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/sharehelper_test.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/transferhelper_core_test.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/noticeutil_test.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/compatwrapper_test.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/transferwrapper_test.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/sharecooperationservice_test.cpp

tests/coop/noticeutil_test.cpp

@@ -0,0 +1,106 @@
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <gtest/gtest.h>
+
+#include "net/linux/noticeutil.h"
+
+#include <QSignalSpy>
+#include <QStringList>
+#include <QVariantMap>
+#include <QVector>
+
+using namespace cooperation_core;
+
+namespace {
+
+class FakeNoticeUtil : public NoticeUtil
+{
+public:
+    struct NotifyCall
+    {
+        uint replacesId { 0 };
+        QString body;
+        int timeout { 0 };
+    };
+
+    QVector<NotifyCall> calls;
+    QVector<uint> closed;
+    uint nextId { 1 };
+
+protected:
+    uint sendNotify(const QString &title, const QString &body, const QStringList &actions,
+                    const QVariantMap &hints, int expireTimeout, uint replacesId) override
+    {
+        Q_UNUSED(title)
+        Q_UNUSED(actions)
+        Q_UNUSED(hints)
+        calls.append(NotifyCall { replacesId, body, expireTimeout });
+        // Mimics org.freedesktop.Notifications: replacing an existing id
+        // returns that same id, a new notification gets a fresh one.
+        return replacesId == 0 ? nextId++ : replacesId;
+    }
+
+    void sendClose(uint notificationId) override
+    {
+        closed.append(notificationId);
+    }
+};
+
+const QVariantMap kHiddenHints { { "x-deepin-ShowInNotifyCenter", false } };
+
+}   // namespace
+
+TEST(NoticeUtilTest, RequestAfterDismissalStartsNewBubble)
+{
+    FakeNoticeUtil util;
+
+    util.notifyMessage("File transfer", "request 1", { "accept" }, kHiddenHints, 10000);
+    ASSERT_EQ(1, util.calls.size());
+    EXPECT_EQ(0u, util.calls[0].replacesId);
+
+    // Progress updates are the only notifications allowed to replace a bubble.
+    util.notifyMessage("File transfer", "progress", { "cancel" }, kHiddenHints, 15000, true);
+    ASSERT_EQ(2, util.calls.size());
+    EXPECT_EQ(1u, util.calls[1].replacesId);
+
+    // Acting on the request dismisses the notification.
+    ASSERT_TRUE(QMetaObject::invokeMethod(&util, "onActionTriggered",
+                                          Q_ARG(uint, 1), Q_ARG(QString, QStringLiteral("accept"))));
+
+    // The next request is a new notification, not an update of the dismissed
+    // one. Some daemons never present an update for an id they already closed.
+    util.notifyMessage("File transfer", "request 2", { "accept" }, kHiddenHints, 10000);
+    ASSERT_EQ(3, util.calls.size());
+    EXPECT_EQ(0u, util.calls[2].replacesId);
+}
+
+TEST(NoticeUtilTest, CloseReleasesNotificationId)
+{
+    FakeNoticeUtil util;
+
+    util.notifyMessage("File transfer", "request", { "accept" }, kHiddenHints, 10000);
+    util.closeNotification();
+    ASSERT_EQ(1, util.closed.size());
+    EXPECT_EQ(1u, util.closed[0]);
+
+    util.notifyMessage("File transfer", "another request", { "accept" }, kHiddenHints, 10000);
+    ASSERT_EQ(2, util.calls.size());
+    EXPECT_EQ(0u, util.calls[1].replacesId);
+}
+
+TEST(NoticeUtilTest, ActionFromAnotherNotificationIsIgnored)
+{
+    FakeNoticeUtil util;
+    QSignalSpy spy(&util, &NoticeUtil::ActionInvoked);
+
+    util.notifyMessage("File transfer", "request", { "accept" }, kHiddenHints, 10000);
+    ASSERT_TRUE(QMetaObject::invokeMethod(&util, "onActionTriggered",
+                                          Q_ARG(uint, 99), Q_ARG(QString, QStringLiteral("reject"))));
+    EXPECT_EQ(0, spy.count());
+
+    // The notification is still on screen, so progress may still replace it.
+    util.notifyMessage("File transfer", "progress", { "cancel" }, kHiddenHints, 15000, true);
+    ASSERT_EQ(2, util.calls.size());
+    EXPECT_EQ(1u, util.calls[1].replacesId);
+}