fix: default action can't work for notification

Default action maybe have text, and it's actionId is default.
Remove entity when manually closing it before timeout.
CloseNotification can't work.

pms: BUG-290767

Author: 18202781743

panels/notification/bubble/bubbleitem.cpp

@@ -244,9 +244,15 @@ QVariantList BubbleItem::actions() const
 void BubbleItem::updateActions()
 {
     QStringList actions = m_entity.actions();
-    if (actions.contains(QLatin1String("default"))) {
-        actions.removeAll(QLatin1String("default"));
+    const auto index = actions.indexOf(QLatin1String("default"));
+    if (index >= 0) {
+        // default Action maybe have text.
         m_defaultAction = QLatin1String("default");
+        if (actions.size() % 2 == 1) {
+            actions.remove(index);
+        } else {
+            actions.remove(index, 2);
+        }
     }
 
     Q_ASSERT(actions.size() % 2 != 1);

panels/notification/bubble/package/NormalBubble.qml

@@ -52,8 +52,8 @@ D.Control {
             if (!bubble.defaultAction)
                 return
 
-            console.log("default action", bubble.index)
-            Applet.invokeDefaultAction(bubble.index, bubble.defaultAction)
+            console.log("default action notify", bubble.appName, bubble.defaultAction)
+            Applet.invokeAction(bubble.index, bubble.defaultAction)
         }
         property bool longPressed
         onPressAndHold: {

panels/notification/center/notifyitem.cpp

@@ -117,9 +117,14 @@ QVariantList AppNotifyItem::actions() const
 void AppNotifyItem::updateActions()
 {
     QStringList actions = m_entity.actions();
-    if (actions.contains(QLatin1String("default"))) {
-        actions.removeAll(QLatin1String("default"));
-        m_defaultAction = QLatin1String("default");
+    const auto index = actions.indexOf(QLatin1String("default"));
+    if (index >= 0) {
+        // default Action maybe have text.
+        if (actions.size() % 2 == 1) {
+            actions.remove(index);
+        } else {
+            actions.remove(index, 2);
+        }
     }
 
     Q_ASSERT(actions.size() % 2 != 1);

panels/notification/common/notifyentity.cpp

@@ -107,6 +107,11 @@ bool NotifyEntity::operator==(const NotifyEntity &other) const
     return false;
 }
 
+bool NotifyEntity::operator!=(const NotifyEntity &other) const
+{
+    return !(operator==(other));
+}
+
 bool NotifyEntity::isValid() const
 {
     return d && d->id > 0;

panels/notification/common/notifyentity.h

@@ -44,6 +44,7 @@ class NotifyEntity
     NotifyEntity &operator=(NotifyEntity &&other);
 
     bool operator==(const NotifyEntity &other) const;
+    bool operator!=(const NotifyEntity &other) const;
 
     bool isValid() const;
 

panels/notification/server/dbusadaptor.cpp

@@ -19,7 +19,7 @@ DbusAdaptor::DbusAdaptor(QObject *parent)
 
 QStringList DbusAdaptor::GetCapabilities()
 {
-    qDebug(notifyLog) << "GetCapabilities";
+    qInfo(notifyLog) << "GetCapabilities";
     return manager()->GetCapabilities();
 }
 
@@ -32,13 +32,13 @@ uint DbusAdaptor::Notify(const QString &appName, uint replacesId, const QString
 
 void DbusAdaptor::CloseNotification(uint id)
 {
-    qDebug(notifyLog) << "Close notification" << id;
+    qInfo(notifyLog) << "Close notification" << id;
     manager()->CloseNotification(id);
 }
 
 void DbusAdaptor::GetServerInformation(QString &name, QString &vendor, QString &version, QString &specVersion)
 {
-    qDebug(notifyLog) << "GetServerInformation";
+    qInfo(notifyLog) << "GetServerInformation";
     manager()->GetServerInformation(name, vendor, version, specVersion);
 }
 
@@ -55,6 +55,7 @@ DDENotificationDbusAdaptor::DDENotificationDbusAdaptor(QObject *parent)
 
 QStringList DDENotificationDbusAdaptor::GetCapabilities()
 {
+    qInfo(notifyLog) << "GetCapabilities";
     return manager()->GetCapabilities();
 }
 
@@ -67,11 +68,13 @@ uint DDENotificationDbusAdaptor::Notify(const QString &appName, uint replacesId,
 
 void DDENotificationDbusAdaptor::CloseNotification(uint id)
 {
+    qInfo(notifyLog) << "Close Notification" << id;
     manager()->CloseNotification(id);
 }
 
 void DDENotificationDbusAdaptor::GetServerInformation(QString &name, QString &vendor, QString &version, QString &specVersion)
 {
+    qInfo(notifyLog) << "GetServerInformation";
     manager()->GetServerInformation(name, vendor, version, specVersion);
 }
 
@@ -102,7 +105,8 @@ void DDENotificationDbusAdaptor::SetAppInfo(const QString &appId, uint configIte
 
 QString DDENotificationDbusAdaptor::GetAppSetting(const QString &appName)
 {
-    return QString();
+    Q_UNUSED(appName)
+    return {};
 }
 
 void DDENotificationDbusAdaptor::SetAppSetting(const QString &settings)

panels/notification/server/notificationmanager.cpp

@@ -103,12 +103,14 @@ uint NotificationManager::recordCount() const
 
 void NotificationManager::actionInvoked(qint64 id, uint bubbleId, const QString &actionKey)
 {
+    qInfo(notifyLog) << "Action invoked, bubbleId:" << bubbleId << ", id:" << id << ", actionKey" << actionKey;
     auto entity = m_persistence->fetchEntity(id);
     if (entity.isValid()) {
+        doActionInvoked(entity, actionKey);
+
         entity.setProcessedType(NotifyEntity::Removed);
         updateEntityProcessed(entity);
     }
-    doActionInvoked(entity, actionKey);
 
     Q_EMIT ActionInvoked(bubbleId, actionKey);
     Q_EMIT NotificationClosed(bubbleId, NotifyEntity::Closed);
@@ -253,19 +255,22 @@ uint NotificationManager::Notify(const QString &appName, uint replacesId, const
         }
     }
 
+    qInfo(notifyLog) << "Notify done, bubbleId:" << entity.bubbleId() << ", id:" << entity.id();
+
     // If replaces_id is 0, the return value is a UINT32 that represent the notification.
     // If replaces_id is not 0, the returned value is the same value as replaces_id.
-    return replacesId == 0 ? entity.bubbleId() : replacesId;
+    return entity.bubbleId();
 }
 void NotificationManager::CloseNotification(uint id)
 {
-    // TODO If the notification no longer exists, an empty D-BUS Error message is sent back.
-    const auto entity = m_persistence->fetchLastEntity(id);
+    auto entity = m_persistence->fetchLastEntity(id);
     if (entity.isValid()) {
-        Q_EMIT NotificationStateChanged(entity.id(), entity.processedType());
+        entity.setProcessedType(NotifyEntity::Removed);
+        updateEntityProcessed(entity);
     }
 
     Q_EMIT NotificationClosed(id, NotifyEntity::Closed);
+    qDebug(notifyLog) << "Close notify, bubbleId" << id << ", id:" << entity.id();
 }
 
 void NotificationManager::GetServerInformation(QString &name, QString &vendor, QString &version, QString &specVersion)
@@ -409,6 +414,7 @@ void NotificationManager::updateEntityProcessed(const NotifyEntity &entity)
     const auto bluetooth = entity.body().contains("%") && entity.actions().contains("cancel");
     if (removed || !showInCenter || bluetooth) {
         m_persistence->removeEntity(id);
+        removePendingEntity(entity);
     } else {
         m_persistence->updateEntityProcessedType(id, entity.processedType());
     }
@@ -481,4 +487,18 @@ void NotificationManager::onHandingPendingEntities()
     }
 }
 
+void NotificationManager::removePendingEntity(const NotifyEntity &entity)
+{
+    for (auto iter = m_pendingTimeoutEntities.begin(); iter != m_pendingTimeoutEntities.end();) {
+        const auto item = iter.value();
+        if (item != entity) {
+            iter++;
+            continue;
+        }
+        m_pendingTimeoutEntities.erase(iter);
+        onHandingPendingEntities();
+        break;
+    }
+}
+
 } // notification

panels/notification/server/notificationmanager.h

@@ -81,6 +81,7 @@ public Q_SLOTS:
 
 private slots:
     void onHandingPendingEntities();
+    void removePendingEntity(const NotifyEntity &entity);
 
 private:
     uint m_replacesCount = 0;