procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix notification daemon detection on KDE 

Minimize usage of QDBusInterface

Log the whole notification daemon information
This commit is contained in:
Ilya Fedin 2020-03-02 19:55:29 +04:00 committed by John Preston
parent 7aadaca62e
commit fdf16d0aea
2 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View File

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "facades.h" #include "facades.h"
#include <QtCore/QVersionNumber> #include <QtCore/QVersionNumber>
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusReply> #include <QtDBus/QDBusReply>
#include <QtDBus/QDBusError> #include <QtDBus/QDBusError>
#include <QtDBus/QDBusMetaType> #include <QtDBus/QDBusMetaType>
@ -113,10 +113,7 @@ QVersionNumber ParseSpecificationVersion(
return QVersionNumber(); return QVersionNumber();
} }
QString GetImageKey() { QString GetImageKey(const QVersionNumber &specificationVersion) {
const auto specificationVersion = ParseSpecificationVersion(
GetServerInformation());
if (!specificationVersion.isNull()) { if (!specificationVersion.isNull()) {
const auto majorVersion = specificationVersion.majorVersion(); const auto majorVersion = specificationVersion.majorVersion();
const auto minorVersion = specificationVersion.minorVersion(); const auto minorVersion = specificationVersion.minorVersion();
@ -141,7 +138,6 @@ QString GetImageKey() {
} }
NotificationData::NotificationData( NotificationData::NotificationData(
not_null<QDBusInterface*> notificationInterface,
const base::weak_ptr<Manager> &manager, const base::weak_ptr<Manager> &manager,
const QString &title, const QString &title,
const QString &subtitle, const QString &subtitle,
@ -149,10 +145,11 @@ NotificationData::NotificationData(
PeerId peerId, PeerId peerId,
MsgId msgId, MsgId msgId,
bool hideReplyButton) bool hideReplyButton)
: _notificationInterface(notificationInterface) : _dbusConnection(QDBusConnection::sessionBus())
, _manager(manager) , _manager(manager)
, _title(title) , _title(title)
, _imageKey(GetImageKey()) , _imageKey(GetImageKey(ParseSpecificationVersion(
GetServerInformation())))
, _peerId(peerId) , _peerId(peerId)
, _msgId(msgId) { , _msgId(msgId) {
const auto capabilities = GetCapabilities(); const auto capabilities = GetCapabilities();
@ -172,7 +169,7 @@ NotificationData::NotificationData(
if (capabilities.contains(qsl("actions"))) { if (capabilities.contains(qsl("actions"))) {
_actions << qsl("default") << QString(); _actions << qsl("default") << QString();
_notificationInterface->connection().connect( _dbusConnection.connect(
kService.utf16(), kService.utf16(),
kObjectPath.utf16(), kObjectPath.utf16(),
kInterface.utf16(), kInterface.utf16(),
@ -181,10 +178,11 @@ NotificationData::NotificationData(
SLOT(notificationClicked(uint,QString))); SLOT(notificationClicked(uint,QString)));
if (capabilities.contains(qsl("inline-reply")) && !hideReplyButton) { if (capabilities.contains(qsl("inline-reply")) && !hideReplyButton) {
_actions << qsl("inline-reply") _actions
<< qsl("inline-reply")
<< tr::lng_notification_reply(tr::now); << tr::lng_notification_reply(tr::now);
_notificationInterface->connection().connect( _dbusConnection.connect(
kService.utf16(), kService.utf16(),
kObjectPath.utf16(), kObjectPath.utf16(),
kInterface.utf16(), kInterface.utf16(),
@ -193,7 +191,8 @@ NotificationData::NotificationData(
SLOT(notificationReplied(uint,QString))); SLOT(notificationReplied(uint,QString)));
} else { } else {
// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html // icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
_actions << qsl("mail-reply-sender") _actions
<< qsl("mail-reply-sender")
<< tr::lng_notification_reply(tr::now); << tr::lng_notification_reply(tr::now);
} }
} }
@ -219,7 +218,7 @@ NotificationData::NotificationData(
_hints["category"] = qsl("im.received"); _hints["category"] = qsl("im.received");
_hints["desktop-entry"] = GetLauncherBasename(); _hints["desktop-entry"] = GetLauncherBasename();
_notificationInterface->connection().connect( _dbusConnection.connect(
kService.utf16(), kService.utf16(),
kObjectPath.utf16(), kObjectPath.utf16(),
kInterface.utf16(), kInterface.utf16(),
@ -233,8 +232,13 @@ bool NotificationData::show() {
? GetIconName() ? GetIconName()
: QString(); : QString();
const QDBusReply<uint> reply = _notificationInterface->call( auto message = QDBusMessage::createMethodCall(
qsl("Notify"), kService.utf16(),
kObjectPath.utf16(),
kInterface.utf16(),
qsl("Notify"));
message.setArguments({
AppName.utf16(), AppName.utf16(),
uint(0), uint(0),
iconName, iconName,
@ -242,7 +246,11 @@ bool NotificationData::show() {
_body, _body,
_actions, _actions,
_hints, _hints,
-1); -1
});
const QDBusReply<uint> reply = _dbusConnection.call(
message);
if (reply.isValid()) { if (reply.isValid()) {
_notificationId = reply.value(); _notificationId = reply.value();
@ -253,16 +261,18 @@ bool NotificationData::show() {
return reply.isValid(); return reply.isValid();
} }
bool NotificationData::close() { void NotificationData::close() {
const QDBusReply<void> reply = _notificationInterface->call( auto message = QDBusMessage::createMethodCall(
qsl("CloseNotification"), kService.utf16(),
_notificationId); kObjectPath.utf16(),
kInterface.utf16(),
qsl("CloseNotification"));
if (!reply.isValid()) { message.setArguments({
LOG(("Native notification error: %1").arg(reply.error().message())); _notificationId
} });
return reply.isValid(); _dbusConnection.send(message);
} }
void NotificationData::setImage(const QString &imagePath) { void NotificationData::setImage(const QString &imagePath) {
@ -331,7 +341,8 @@ QDBusArgument &operator<<(
QDBusArgument &argument, QDBusArgument &argument,
const NotificationData::ImageData &imageData) { const NotificationData::ImageData &imageData) {
argument.beginStructure(); argument.beginStructure();
argument << imageData.width argument
<< imageData.width
<< imageData.height << imageData.height
<< imageData.rowStride << imageData.rowStride
<< imageData.hasAlpha << imageData.hasAlpha
@ -346,7 +357,8 @@ const QDBusArgument &operator>>(
const QDBusArgument &argument, const QDBusArgument &argument,
NotificationData::ImageData &imageData) { NotificationData::ImageData &imageData) {
argument.beginStructure(); argument.beginStructure();
argument >> imageData.width argument
>> imageData.width
>> imageData.height >> imageData.height
>> imageData.rowStride >> imageData.rowStride
>> imageData.hasAlpha >> imageData.hasAlpha
@ -380,12 +392,7 @@ bool SkipToast() {
bool Supported() { bool Supported() {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
static const auto Available = QDBusInterface( static const auto Available = !GetServerInformation().empty();
kService.utf16(),
kObjectPath.utf16(),
kInterface.utf16()
).isValid();
return Available; return Available;
#else // !TDESKTOP_DISABLE_DBUS_INTEGRATION #else // !TDESKTOP_DISABLE_DBUS_INTEGRATION
return false; return false;
@ -405,27 +412,21 @@ std::unique_ptr<Window::Notifications::Manager> Create(
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
Manager::Private::Private(not_null<Manager*> manager, Type type) Manager::Private::Private(not_null<Manager*> manager, Type type)
: _cachedUserpics(type) : _cachedUserpics(type)
, _manager(manager) , _manager(manager) {
, _notificationInterface(
std::make_shared<QDBusInterface>(
kService.utf16(),
kObjectPath.utf16(),
kInterface.utf16())) {
qDBusRegisterMetaType<NotificationData::ImageData>(); qDBusRegisterMetaType<NotificationData::ImageData>();
const auto specificationVersion = ParseSpecificationVersion( const auto serverInformation = GetServerInformation();
GetServerInformation());
const auto capabilities = GetCapabilities(); const auto capabilities = GetCapabilities();
if (!specificationVersion.isNull()) { if (!serverInformation.empty()) {
LOG(("Notification daemon specification version: %1") LOG(("Notification daemon product name: %1").arg(serverInformation[0]));
.arg(specificationVersion.toString())); LOG(("Notification daemon vendor name: %1").arg(serverInformation[1]));
LOG(("Notification daemon version: %1").arg(serverInformation[2]));
LOG(("Notification daemon specification version: %1").arg(serverInformation[3]));
} }
if (!capabilities.empty()) { if (!capabilities.isEmpty()) {
const auto capabilitiesString = capabilities.join(", "); LOG(("Notification daemon capabilities: %1").arg(capabilities.join(", ")));
LOG(("Notification daemon capabilities: %1").arg(capabilitiesString));
} }
} }
@ -438,7 +439,6 @@ void Manager::Private::showNotification(
bool hideNameAndPhoto, bool hideNameAndPhoto,
bool hideReplyButton) { bool hideReplyButton) {
auto notification = std::make_shared<NotificationData>( auto notification = std::make_shared<NotificationData>(
_notificationInterface.get(),
_manager, _manager,
title, title,
subtitle, subtitle,

8
Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/weak_ptr.h" #include "base/weak_ptr.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusArgument> #include <QtDBus/QDBusArgument>
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
@ -28,7 +28,6 @@ class NotificationData : public QObject {
public: public:
NotificationData( NotificationData(
not_null<QDBusInterface*> notificationInterface,
const base::weak_ptr<Manager> &manager, const base::weak_ptr<Manager> &manager,
const QString &title, const QString &title,
const QString &subtitle, const QString &subtitle,
@ -43,7 +42,7 @@ public:
NotificationData &operator=(NotificationData &&other) = delete; NotificationData &operator=(NotificationData &&other) = delete;
bool show(); bool show();
bool close(); void close();
void setImage(const QString &imagePath); void setImage(const QString &imagePath);
struct ImageData { struct ImageData {
@ -54,7 +53,7 @@ public:
}; };
private: private:
const not_null<QDBusInterface*> _notificationInterface; QDBusConnection _dbusConnection;
base::weak_ptr<Manager> _manager; base::weak_ptr<Manager> _manager;
QString _title; QString _title;
@ -134,7 +133,6 @@ private:
Window::Notifications::CachedUserpics _cachedUserpics; Window::Notifications::CachedUserpics _cachedUserpics;
base::weak_ptr<Manager> _manager; base::weak_ptr<Manager> _manager;
std::shared_ptr<QDBusInterface> _notificationInterface;
}; };
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION