File 0001-Device-Notifier-Avoid-accessing-attributes... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Device-Notifier-Avoid-accessing-attributes-of-stale-.patch of Package plasma5-workspace (Revision ee89f52e6dce7ab42f0e347d09c1ded5)

Currently displaying revision ee89f52e6dce7ab42f0e347d09c1ded5 , Show latest

From 470feb74e1353752ce3f275b4622c35451673eb7 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 12:19:43 +0200
Subject: [PATCH 1/2] [Device Notifier] Avoid accessing attributes of stale
 UDIs

Summary:
When a Solid device is removed (e.g. a CD is ejected) the notifier tries
to read the attributes although the Source for the UDI has just vanished.

Fixes several QML error messages, i.e. "TypeError: Cannot read property
'...' of undefined" and "Unable to assign [undefined] to QString".

Apparently these errors also have the effect of items showing outdated
state, i.e. optical media still being shown after ejecting it.

CCBUG: 394348

Test Plan:
1. insert optical medium
2. eject
Without the changes, the item was stuck
Now, the item is removed as soon as the medium is ejected

Also, no more errors are logged for the devicenotifier

Reviewers: #frameworks

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D15687
---
 .../package/contents/ui/FullRepresentation.qml        | 11 ++++++-----
 .../package/contents/ui/devicenotifier.qml            |  8 ++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
index ca0a3f71..3c6094bd 100644
--- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
+++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
@@ -158,10 +158,10 @@ MouseArea {
         DeviceItem {
             width: notifierDialog.width
             udi: DataEngineSource
-            icon: sdSource.data[udi].Icon
-            deviceName: sdSource.data[udi].Description
-            emblemIcon: Emblems[0]
-            state: sdSource.data[udi].State
+            icon: sdSource.data[udi] ? sdSource.data[udi].Icon : ""
+            deviceName: sdSource.data[udi] ? sdSource.data[udi].Description : ""
+            emblemIcon: Emblems && Emblems[0] ? Emblems[0] : ""
+            state: sdSource.data[udi] ? sdSource.data[udi].State : 0
 
             percentUsage: {
                 if (!sdSource.data[udi]) {
@@ -177,9 +177,10 @@ MouseArea {
             actionIcon: mounted ? "media-eject" : "media-mount"
             actionVisible: model["Device Types"].indexOf("Portable Media Player") == -1
             actionToolTip: {
+		var types = model["Device Types"];
                 if (!mounted) {
                     return i18n("Click to access this device from other applications.")
-                } else if (model["Device Types"].indexOf("OpticalDisc") != -1) {
+                } else if (types && types.indexOf("OpticalDisc") != -1) {
                     return i18n("Click to eject this disc.")
                 } else {
                     return i18n("Click to safely remove this device.")
diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
index f2266b79..8392b70d 100644
--- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
@@ -140,6 +140,10 @@ Item {
             }
 
             var device = data[udi];
+            if (!device) {
+                return false;
+            }
+
             return (devicesType === "removable" && device.Removable)
                 || (devicesType === "nonRemovable" && !device.Removable);
         }
@@ -246,6 +250,10 @@ Item {
     }
 
     function isMounted(udi) {
+        if (!sdSource.data[udi]) {
+            return false;
+        }
+
         var types = sdSource.data[udi]["Device Types"];
         if (types.indexOf("Storage Access") >= 0) {
             return sdSource.data[udi]["Accessible"];
-- 
2.19.0

Places

File 0001-Device-Notifier-Avoid-accessing-attributes-of-stale-.patch of Package plasma5-workspace (Revision ee89f52e6dce7ab42f0e347d09c1ded5)

Places