feat: enhance notification icon handling

panels/notification/bubble/bubbleitem.cpp

@@ -4,12 +4,14 @@
 
 #include "bubbleitem.h"
 
 #include <QUrl>
 #include <QTimer>
 #include <QImage>
+#include <QDir>
+#include <QFile>
 #include <QDBusArgument>
 #include <QTemporaryFile>
 #include <QLoggingCategory>
 
 #include <DIconTheme>
 
@@ -140,15 +142,24 @@
     if (img.isNull()) {
         img = decodeImageFromBase64(imageData);
     }
+
     if (!img.isNull()) {
-        QTemporaryFile file("notification_icon");
-        img.save(file.fileName());
-        return file.fileName();
+        QTemporaryFile file(QDir::temp().filePath("notification_icon_XXXXXX.png"));
+        if (file.open()) {
+            QString filePath = file.fileName();
+            if (img.save(filePath)) {
+                file.setAutoRemove(false);
+                file.close();
+                qDebug(notifyLog) << "Created temporary icon file:" << filePath;
+                return filePath;
+            }
+
+            file.close();
+            return {};
+        }
     }
 
-    DGUI_USE_NAMESPACE;
-    auto icon = DIconTheme::findQIcon(appName, DIconTheme::findQIcon("application-x-desktop"));
-    return icon.name();
+    return {};
 }
 
 
@@ -166,6 +177,14 @@
     setEntity(entity);
 }
 
+BubbleItem::~BubbleItem()
+{
+    // clean up temporary icon file.
+    if (!m_tempIconPath.isEmpty() && QFile::exists(m_tempIconPath)) {
+        QFile::remove(m_tempIconPath);
+    }
+}
+
 void BubbleItem::setEntity(const NotifyEntity &entity)
 {
     m_entity = entity;
@@ -192,13 +211,19 @@
     return m_entity.appName();
 }
 
-QString BubbleItem::appIcon() const
+QString BubbleItem::appIcon()
 {
     if (!m_entity.appIcon().isEmpty()) {
         return m_entity.appIcon();
     }
 
-    return imagePathOfNotification(m_entity.hints(), m_entity.appIcon(), m_entity.appName());
+    if (!m_tempIconPath.isEmpty() && QFile::exists(m_tempIconPath)) {
+        return m_tempIconPath;
+    }
+
+    m_tempIconPath = imagePathOfNotification(m_entity.hints(), m_entity.appIcon(), m_entity.appName());
+    // if this is empty path, UI can fallback to application-x-desktop icon.
+    return m_tempIconPath;
 }
 
 QString BubbleItem::summary() const

panels/notification/bubble/bubbleitem.h

@@ -18,15 +18,16 @@
 
     explicit BubbleItem(QObject *parent = nullptr);
     explicit BubbleItem(const NotifyEntity &entity, QObject *parent = nullptr);
+    ~BubbleItem();
 
 public:
     void setEntity(const NotifyEntity &entity);
 
 public:
     qint64 id() const;
     uint bubbleId() const;
     QString appName() const;
-    QString appIcon() const;
+    QString appIcon();
     QString summary() const;
     QString body() const;
     uint replacesId() const;
@@ -65,6 +66,7 @@
     bool m_enablePreview = true;
     QVariantList m_actions;
     QString m_defaultAction;
+    QString m_tempIconPath;
 };
 
 }