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

Remove usage of QDBusInterface from non-class methods in Linux native notifications

This commit is contained in:
Ilya Fedin 2020-02-29 07:42:24 +04:00 committed by John Preston
parent 4e345ac688
commit 57b76e3f00
2 changed files with 67 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,16 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "platform/linux/notifications_manager_linux.h" #include "platform/linux/notifications_manager_linux.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include "platform/linux/specific_linux.h" #include "platform/linux/specific_linux.h"
#include "history/history.h" #include "history/history.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "facades.h" #include "facades.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QtCore/QVersionNumber> #include <QtCore/QVersionNumber>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusReply> #include <QtDBus/QDBusReply>
#include <QtDBus/QDBusMetaType> #include <QtDBus/QDBusMetaType>
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
namespace Platform { namespace Platform {
namespace Notifications { namespace Notifications {
@ -28,44 +29,47 @@ constexpr auto kService = "org.freedesktop.Notifications"_cs;
constexpr auto kObjectPath = "/org/freedesktop/Notifications"_cs; constexpr auto kObjectPath = "/org/freedesktop/Notifications"_cs;
constexpr auto kInterface = kService; constexpr auto kInterface = kService;
std::vector<QString> GetServerInformation( std::vector<QString> GetServerInformation() {
const std::shared_ptr<QDBusInterface> &notificationInterface) {
std::vector<QString> serverInformation; std::vector<QString> serverInformation;
const auto serverInformationReply = notificationInterface
->call(qsl("GetServerInformation"));
if (serverInformationReply.type() == QDBusMessage::ReplyMessage) { const auto message = QDBusMessage::createMethodCall(
for (const auto &arg : serverInformationReply.arguments()) { kService.utf16(),
if (static_cast<QMetaType::Type>(arg.type()) kObjectPath.utf16(),
== QMetaType::QString) { kInterface.utf16(),
serverInformation.push_back(arg.toString()); qsl("GetServerInformation"));
} else {
LOG(("Native notification error: " const auto reply = QDBusConnection::sessionBus().call(message);
"all elements in GetServerInformation "
"should be strings")); if (reply.type() == QDBusMessage::ReplyMessage) {
} ranges::transform(
} reply.arguments(),
} else if (serverInformationReply.type() == QDBusMessage::ErrorMessage) { ranges::back_inserter(serverInformation),
LOG(("Native notification error: %1") &QVariant::toString
.arg(serverInformationReply.errorMessage())); );
} else if (reply.type() == QDBusMessage::ErrorMessage) {
LOG(("Native notification error: %1").arg(reply.errorMessage()));
} else { } else {
LOG(("Native notification error: " LOG(("Native notification error: "
"error while getting information about notification daemon")); "invalid reply from GetServerInformation"));
} }
return serverInformation; return serverInformation;
} }
QStringList GetCapabilities( QStringList GetCapabilities() {
const std::shared_ptr<QDBusInterface> &notificationInterface) { const auto message = QDBusMessage::createMethodCall(
const QDBusReply<QStringList> capabilitiesReply = notificationInterface kService.utf16(),
->call(qsl("GetCapabilities")); kObjectPath.utf16(),
kInterface.utf16(),
qsl("GetCapabilities"));
if (capabilitiesReply.isValid()) { const QDBusReply<QStringList> reply = QDBusConnection::sessionBus().call(
return capabilitiesReply.value(); message);
if (reply.isValid()) {
return reply.value();
} else { } else {
LOG(("Native notification error: %1") LOG(("Native notification error: %1").arg(reply.error().message()));
.arg(capabilitiesReply.error().message()));
} }
return {}; return {};
@ -83,10 +87,9 @@ QVersionNumber ParseSpecificationVersion(
return QVersionNumber(); return QVersionNumber();
} }
QString GetImageKey( QString GetImageKey() {
const std::shared_ptr<QDBusInterface> &notificationInterface) {
const auto specificationVersion = ParseSpecificationVersion( const auto specificationVersion = ParseSpecificationVersion(
GetServerInformation(notificationInterface)); GetServerInformation());
if (!specificationVersion.isNull()) { if (!specificationVersion.isNull()) {
const auto majorVersion = specificationVersion.majorVersion(); const auto majorVersion = specificationVersion.majorVersion();
@ -105,13 +108,14 @@ QString GetImageKey(
} else { } else {
LOG(("Native notification error: specification version is null")); LOG(("Native notification error: specification version is null"));
} }
return QString(); return QString();
} }
} }
NotificationData::NotificationData( NotificationData::NotificationData(
const std::shared_ptr<QDBusInterface> &notificationInterface, 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,
@ -122,10 +126,10 @@ NotificationData::NotificationData(
: _notificationInterface(notificationInterface) : _notificationInterface(notificationInterface)
, _manager(manager) , _manager(manager)
, _title(title) , _title(title)
, _imageKey(GetImageKey(_notificationInterface)) , _imageKey(GetImageKey())
, _peerId(peerId) , _peerId(peerId)
, _msgId(msgId) { , _msgId(msgId) {
const auto capabilities = GetCapabilities(_notificationInterface); const auto capabilities = GetCapabilities();
if (capabilities.contains(qsl("body-markup"))) { if (capabilities.contains(qsl("body-markup"))) {
_body = subtitle.isEmpty() _body = subtitle.isEmpty()
@ -203,7 +207,7 @@ bool NotificationData::show() {
? GetIconName() ? GetIconName()
: QString(); : QString();
const QDBusReply<uint> notifyReply = _notificationInterface->call( const QDBusReply<uint> reply = _notificationInterface->call(
qsl("Notify"), qsl("Notify"),
AppName.utf16(), AppName.utf16(),
uint(0), uint(0),
@ -214,27 +218,25 @@ bool NotificationData::show() {
_hints, _hints,
-1); -1);
if (notifyReply.isValid()) { if (reply.isValid()) {
_notificationId = notifyReply.value(); _notificationId = reply.value();
} else { } else {
LOG(("Native notification error: %1") LOG(("Native notification error: %1").arg(reply.error().message()));
.arg(notifyReply.error().message()));
} }
return notifyReply.isValid(); return reply.isValid();
} }
bool NotificationData::close() { bool NotificationData::close() {
const QDBusReply<void> closeReply = _notificationInterface->call( const QDBusReply<void> reply = _notificationInterface->call(
qsl("CloseNotification"), qsl("CloseNotification"),
_notificationId); _notificationId);
if (!closeReply.isValid()) { if (!reply.isValid()) {
LOG(("Native notification error: %1") LOG(("Native notification error: %1").arg(reply.error().message()));
.arg(closeReply.error().message()));
} }
return closeReply.isValid(); return reply.isValid();
} }
void NotificationData::setImage(const QString &imagePath) { void NotificationData::setImage(const QString &imagePath) {
@ -249,9 +251,9 @@ void NotificationData::setImage(const QString &imagePath) {
(const char*)image.constBits(), (const char*)image.constBits(),
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
image.byteCount()); image.byteCount());
#else #else // Qt < 5.10.0
image.sizeInBytes()); image.sizeInBytes());
#endif #endif // Qt >= 5.10.0
const auto imageData = ImageData{ const auto imageData = ImageData{
image.width(), image.width(),
@ -328,7 +330,7 @@ const QDBusArgument &operator>>(
argument.endStructure(); argument.endStructure();
return argument; return argument;
} }
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
bool Supported() { bool Supported() {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
@ -339,9 +341,9 @@ bool Supported() {
).isValid(); ).isValid();
return Available; return Available;
#else #else // !TDESKTOP_DISABLE_DBUS_INTEGRATION
return false; return false;
#endif #endif // TDESKTOP_DISABLE_DBUS_INTEGRATION
} }
std::unique_ptr<Window::Notifications::Manager> Create( std::unique_ptr<Window::Notifications::Manager> Create(
@ -350,12 +352,12 @@ std::unique_ptr<Window::Notifications::Manager> Create(
if (Global::NativeNotifications() && Supported()) { if (Global::NativeNotifications() && Supported()) {
return std::make_unique<Manager>(system); return std::make_unique<Manager>(system);
} }
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
return nullptr; return nullptr;
} }
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
Manager::Private::Private(Manager *manager, Type type) Manager::Private::Private(not_null<Manager*> manager, Type type)
: _cachedUserpics(type) : _cachedUserpics(type)
, _manager(manager) , _manager(manager)
, _notificationInterface( , _notificationInterface(
@ -366,9 +368,9 @@ Manager::Private::Private(Manager *manager, Type type)
qDBusRegisterMetaType<NotificationData::ImageData>(); qDBusRegisterMetaType<NotificationData::ImageData>();
const auto specificationVersion = ParseSpecificationVersion( const auto specificationVersion = ParseSpecificationVersion(
GetServerInformation(_notificationInterface)); GetServerInformation());
const auto capabilities = GetCapabilities(_notificationInterface); const auto capabilities = GetCapabilities();
if (!specificationVersion.isNull()) { if (!specificationVersion.isNull()) {
LOG(("Notification daemon specification version: %1") LOG(("Notification daemon specification version: %1")
@ -390,7 +392,7 @@ 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, _notificationInterface.get(),
_manager, _manager,
title, title,
subtitle, subtitle,
@ -462,7 +464,7 @@ Manager::Private::~Private() {
clearAll(); clearAll();
} }
Manager::Manager(Window::Notifications::System *system) Manager::Manager(not_null<Window::Notifications::System*> system)
: NativeManager(system) : NativeManager(system)
, _private(std::make_unique<Private>(this, Private::Type::Rounded)) { , _private(std::make_unique<Private>(this, Private::Type::Rounded)) {
} }
@ -498,7 +500,7 @@ void Manager::doClearAllFast() {
void Manager::doClearFromHistory(not_null<History*> history) { void Manager::doClearFromHistory(not_null<History*> history) {
_private->clearFromHistory(history); _private->clearFromHistory(history);
} }
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
} // namespace Notifications } // namespace Notifications
} // namespace Platform } // namespace Platform

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

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusArgument> #include <QtDBus/QDBusArgument>
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
namespace Platform { namespace Platform {
namespace Notifications { namespace Notifications {
@ -36,7 +36,7 @@ class NotificationData : public QObject {
public: public:
NotificationData( NotificationData(
const std::shared_ptr<QDBusInterface> &notificationInterface, 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,
@ -62,7 +62,7 @@ public:
}; };
private: private:
std::shared_ptr<QDBusInterface> _notificationInterface; const not_null<QDBusInterface*> _notificationInterface;
base::weak_ptr<Manager> _manager; base::weak_ptr<Manager> _manager;
QString _title; QString _title;
@ -95,7 +95,7 @@ class Manager
: public Window::Notifications::NativeManager : public Window::Notifications::NativeManager
, public base::has_weak_ptr { , public base::has_weak_ptr {
public: public:
Manager(Window::Notifications::System *system); Manager(not_null<Window::Notifications::System*> system);
void clearNotification(PeerId peerId, MsgId msgId); void clearNotification(PeerId peerId, MsgId msgId);
~Manager(); ~Manager();
@ -120,7 +120,7 @@ private:
class Manager::Private { class Manager::Private {
public: public:
using Type = Window::Notifications::CachedUserpics::Type; using Type = Window::Notifications::CachedUserpics::Type;
explicit Private(Manager *manager, Type type); explicit Private(not_null<Manager*> manager, Type type);
void showNotification( void showNotification(
not_null<PeerData*> peer, not_null<PeerData*> peer,
@ -144,11 +144,11 @@ private:
base::weak_ptr<Manager> _manager; base::weak_ptr<Manager> _manager;
std::shared_ptr<QDBusInterface> _notificationInterface; std::shared_ptr<QDBusInterface> _notificationInterface;
}; };
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
} // namespace Notifications } // namespace Notifications
} // namespace Platform } // namespace Platform
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
Q_DECLARE_METATYPE(Platform::Notifications::NotificationData::ImageData) Q_DECLARE_METATYPE(Platform::Notifications::NotificationData::ImageData)
#endif #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION