File 0002-Devicenotifications-Engine-Keep-at-most-on... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Devicenotifications-Engine-Keep-at-most-one-notifica.patch of Package plasma5-workspace (Revision ee89f52e6dce7ab42f0e347d09c1ded5)

Currently displaying revision ee89f52e6dce7ab42f0e347d09c1ded5 , Show latest

From 5870267629f81216db5a5c7bc3a65fb5353d9d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 22 Sep 2018 14:33:36 +0200
Subject: [PATCH 2/2] [Devicenotifications Engine] Keep at most one
 notification per UDI

Each notification is created as new datasource, and is newer removed
as long as the engine exists. This is especially bad for long living
applets like the device notifier.

Also cancel (remove source) any old notifications in case of a successful
setup, otherwise old error messages are shown in the device notifier.
---
 .../devicenotificationsengine.cpp                 | 15 ++++++++++++++-
 .../devicenotificationsengine.h                   |  3 +++
 dataengines/devicenotifications/ksolidnotify.cpp  |  6 ++++++
 dataengines/devicenotifications/ksolidnotify.h    |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dataengines/devicenotifications/devicenotificationsengine.cpp b/dataengines/devicenotifications/devicenotificationsengine.cpp
index ebdfa9c5..dd71938c 100644
--- a/dataengines/devicenotifications/devicenotificationsengine.cpp
+++ b/dataengines/devicenotifications/devicenotificationsengine.cpp
@@ -28,6 +28,7 @@ DeviceNotificationsEngine::DeviceNotificationsEngine( QObject* parent, const QVa
       m_solidNotify(new KSolidNotify(this))
 {
     connect(m_solidNotify, &KSolidNotify::notify, this, &DeviceNotificationsEngine::notify);
+    connect(m_solidNotify, &KSolidNotify::clearNotification, this, &DeviceNotificationsEngine::clearNotification);
 }
 
 DeviceNotificationsEngine::~DeviceNotificationsEngine()
@@ -36,7 +37,7 @@ DeviceNotificationsEngine::~DeviceNotificationsEngine()
 
 void DeviceNotificationsEngine::notify(Solid::ErrorType solidError, const QString& error, const QString& errorDetails, const QString &udi)
 {
-    const QString source = QStringLiteral("notification %1").arg(m_id++);
+    const QString source = QStringLiteral("notification %1").arg(m_id);
 
     Plasma::DataEngine::Data notificationData;
     notificationData.insert(QStringLiteral("solidError"), solidError);
@@ -45,6 +46,18 @@ void DeviceNotificationsEngine::notify(Solid::ErrorType solidError, const QStrin
     notificationData.insert(QStringLiteral("udi"), udi);
 
     setData(source, notificationData );
+
+    clearNotification(udi);
+    m_notifications[udi] = m_id++;
+}
+
+void DeviceNotificationsEngine::clearNotification(const QString &udi)
+{
+    auto id_it = m_notifications.find(udi);
+    if (id_it != m_notifications.end()) {
+        removeSource(QStringLiteral("notification %1").arg(*id_it));
+        m_notifications.erase(id_it);
+    }
 }
 
 K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(devicenotifications, DeviceNotificationsEngine, "plasma-dataengine-devicenotifications.json")
diff --git a/dataengines/devicenotifications/devicenotificationsengine.h b/dataengines/devicenotifications/devicenotificationsengine.h
index 821f5496..c8a53898 100644
--- a/dataengines/devicenotifications/devicenotificationsengine.h
+++ b/dataengines/devicenotifications/devicenotificationsengine.h
@@ -23,6 +23,7 @@
 #define DEVICENOTIFICATIONSENGINE_H
 
 #include <Plasma/DataEngine>
+#include <QMap>
 
 #include "ksolidnotify.h"
 
@@ -39,10 +40,12 @@ public:
 
 private slots:
      void notify(Solid::ErrorType solidError, const QString& error, const QString& errorDetails, const QString &udi);
+    void clearNotification(const QString &udi);
 
 private:
     uint m_id;
     KSolidNotify * m_solidNotify;
+    QMap<QString, uint> m_notifications;
 };
 
 #endif
diff --git a/dataengines/devicenotifications/ksolidnotify.cpp b/dataengines/devicenotifications/ksolidnotify.cpp
index 0620e393..8b28d620 100644
--- a/dataengines/devicenotifications/ksolidnotify.cpp
+++ b/dataengines/devicenotifications/ksolidnotify.cpp
@@ -72,6 +72,7 @@ void KSolidNotify::onDeviceRemoved(const QString &udi)
         }
     }
     m_devices.remove(udi);
+    emit clearNotification(udi);
 }
 
 bool KSolidNotify::isSafelyRemovable(const QString &udi) const
@@ -148,6 +149,11 @@ void KSolidNotify::queryBlockingApps(const QString &devicePath)
 
 void KSolidNotify::onSolidReply(SolidReplyType type, Solid::ErrorType error, const QVariant &errorData, const QString &udi)
 {
+    if ((error == Solid::ErrorType::NoError) && (type == SolidReplyType::Setup)) {
+        emit clearNotification(udi);
+        return;
+    }
+
     QString errorMsg;
 
     switch (error) {
diff --git a/dataengines/devicenotifications/ksolidnotify.h b/dataengines/devicenotifications/ksolidnotify.h
index fdc46302..bbf45718 100644
--- a/dataengines/devicenotifications/ksolidnotify.h
+++ b/dataengines/devicenotifications/ksolidnotify.h
@@ -48,6 +48,7 @@ public:
 signals:
     void notify(Solid::ErrorType solidError, const QString& error, const QString& errorDetails, const QString &udi);
     void blockingAppsReady(const QStringList &apps);
+    void clearNotification(const QString &udi);
 
 protected slots:
     void onDeviceAdded(const QString &udi);
-- 
2.19.0

Places

File 0002-Devicenotifications-Engine-Keep-at-most-one-notifica.patch of Package plasma5-workspace (Revision ee89f52e6dce7ab42f0e347d09c1ded5)

Places