Skip to content

fix: dbus_message protocol error for notification #948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Dec 10, 2024
Merged

fix: dbus_message protocol error for notification #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions panels/notification/server/dbusadaptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ uint DbusAdaptor::Notify(const QString &appName, uint replacesId, const QString
int expireTimeout)
{
uint id = manager()->Notify(appName, replacesId, appIcon, summary, body, actions, hints, expireTimeout);
if (id == std::numeric_limits<uint>::max()) {
if (id == 0) {
QDBusError error(QDBusError::InternalError, "Notify failed.");
QDBusMessage reply = QDBusMessage::createError(error);

return QDBusConnection::sessionBus().send(reply);
QDBusConnection::sessionBus().send(reply);
}

return id;
Expand Down Expand Up @@ -72,11 +72,11 @@ uint DDENotificationDbusAdaptor::Notify(const QString &appName, uint replacesId,
int expireTimeout)
{
uint id = manager()->Notify(appName, replacesId, appIcon, summary, body, actions, hints, expireTimeout);
if (id == std::numeric_limits<uint>::max()) {
if (id == 0) {
QDBusError error(QDBusError::InternalError, "Notify failed.");
QDBusMessage reply = QDBusMessage::createError(error);

return QDBusConnection::sessionBus().send(reply);
QDBusConnection::sessionBus().send(reply);
}

return id;
Expand Down
3 changes: 2 additions & 1 deletion panels/notification/server/notificationmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ uint NotificationManager::Notify(const QString &appName, uint replacesId, const
if (entity.processedType() != NotifyEntity::None) {
qint64 id = m_persistence->addEntity(entity);
if (id == -1) {
return std::numeric_limits<uint>::max();
qWarning(notifyLog) << "Failed on saving DB, bubbleId:" << entity.bubbleId() << ", appName" << appName;
return 0;
}

entity.setId(id);
Expand Down
Loading