File 0001-Treat-device-names-as-plaintext-not-rich-text.patch of Package kdeconnect-kde
From 00ea0f6b4af342c6d780573afc9e93a23b3b8937 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 12 Jul 2017 10:51:09 +0200
Subject: [PATCH] Treat device names as plaintext, not rich text
Summary:
Notifications, QML Text and QLabel accept a HTML subset,
which does not make sense for device names.
BUG: 382243
Test Plan:
Sent a pair request and accepted it, device name
now shown as plain text everywhere.
Reviewers: #kde_connect, albertvaka
Subscribers: #kde_connect
Differential Revision: https://phabricator.kde.org/D6640
---
daemon/kdeconnectd.cpp | 2 +-
kcm/kcm.ui | 3 +++
plasmoid/package/contents/ui/DeviceDelegate.qml | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index 0f242c7..696babe 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -46,7 +46,7 @@ public:
KNotification* notification = new KNotification(QStringLiteral("pairingRequest"));
notification->setIconName(QStringLiteral("dialog-information"));
notification->setComponentName(QStringLiteral("kdeconnect"));
- notification->setText(i18n("Pairing request from %1", getDevice(d->deviceLink()->deviceId())->name()));
+ notification->setText(i18n("Pairing request from %1", getDevice(d->deviceLink()->deviceId())->name()).toHtmlEscaped());
notification->setActions(QStringList() << i18n("Accept") << i18n("Reject"));
connect(notification, &KNotification::ignored, d, &PairingHandler::rejectPairing);
connect(notification, &KNotification::action1Activated, d, &PairingHandler::acceptPairing);
diff --git a/kcm/kcm.ui b/kcm/kcm.ui
index a58569e..a533cb3 100644
--- a/kcm/kcm.ui
+++ b/kcm/kcm.ui
@@ -156,6 +156,9 @@
<property name="text">
<string>Device</string>
</property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
</widget>
</item>
<item>
diff --git a/plasmoid/package/contents/ui/DeviceDelegate.qml b/plasmoid/package/contents/ui/DeviceDelegate.qml
index e90e021..15b124a 100644
--- a/plasmoid/package/contents/ui/DeviceDelegate.qml
+++ b/plasmoid/package/contents/ui/DeviceDelegate.qml
@@ -44,6 +44,7 @@ PlasmaComponents.ListItem
elide: Text.ElideRight
text: display
Layout.fillWidth: true
+ textFormat: Text.PlainText
}
//Find my phone
--
2.13.2