Skip to content

Background: Make send_notification async and let it throw errors #85

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
danirabbit merged 5 commits into from
Jun 21, 2023
Merged

Background: Make send_notification async and let it throw errors #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f351a2f
Squashed commit of the following:
leolost2605 Jun 12, 2023
929f2b9
Make send_notification async and throw an error
leolost2605 Jun 12, 2023
0dc009b
Fix issue
leolost2605 Jun 12, 2023
b74e69e
Merge branch 'main' into async-send-notification
leolost2605 Jun 12, 2023
655462c
Merge branch 'main' into async-send-notification
danirabbit Jun 21, 2023
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
38 changes: 14 additions & 24 deletions src/Background/NotificationRequest.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,17 @@ public class Background.NotificationRequest : Object {
}

[DBus (visible = false)]
public void send_notification (string app_id, string app_name) {
public async void send_notification (string app_id, string app_name) throws Error {
if (notifications == null) {
Bus.get_proxy.begin<Fdo.Notifications> (SESSION, Fdo.Notifications.NAME, Fdo.Notifications.PATH, NONE, null,
(obj, res) => {
try {
notifications = Bus.get_proxy.end (res);
notifications.action_invoked.connect (action_invoked);
notifications.notification_closed.connect (notification_closed);
send_notification (app_id, app_name);
} catch {
warning ("Cannot connect to notifications server, skipping notify request for '%s'", app_id);
response (FAILED);
}
});
return;
notifications = yield Bus.get_proxy<Fdo.Notifications> (
SESSION,
Fdo.Notifications.NAME,
Fdo.Notifications.PATH,
NONE,
null
);
notifications.action_invoked.connect (action_invoked);
notifications.notification_closed.connect (notification_closed);
}

string[] actions = {
Expand All @@ -112,22 +108,16 @@ public class Background.NotificationRequest : Object {
hints["desktop-entry"] = app_id;
hints["urgency"] = (uint8) 1;

notifications.notify.begin (
id = yield notifications.notify (
app_name, 0, "",
_("Background activity"),
_("“%s” is running in the background without appropriate permission").printf (app_name),
actions,
hints,
-1, (obj, res) => {
try {
id = notifications.notify.end (res);
requests[id] = this;
} catch (Error e) {
warning ("Failed to notify background activity from '%s': %s", app_id, e.message);
response (FAILED);
}
}
-1
);

requests[id] = this;
}

public async void close () throws DBusError, IOError {
Expand Down
8 changes: 6 additions & 2 deletions src/Background/Portal.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,12 @@ public class Background.Portal : Object {
}

debug ("Sending desktop notification for '%s'.", app_id);
notification.send_notification (app_id, name);
yield;
try {
yield notification.send_notification (app_id, name);
yield;
} catch (Error e) {
warning ("Failed to notify about background activity from '%s': %s", app_id, e.message);
}

connection.unregister_object (register_id);
response = _response;
Expand Down