Skip to content

Dismiss notifications properly #508

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
rullzer merged 4 commits into from
Dec 11, 2019
Merged

Dismiss notifications properly #508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a10ca51
Dismiss notifications properly
rullzer Dec 9, 2019
3a97b78
Use known INotification instances when possible
nickvergessen Dec 10, 2019
0a25657
Make sure we dont fail with an exception
nickvergessen Dec 10, 2019
36b64ec
Fix tests
rullzer Dec 10, 2019
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
Prev Previous commit
Next Next commit
Make sure we dont fail with an exception 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @rullzer
nickvergessen authored and rullzer committed Dec 10, 2019
commit 0a256573c0fe261ed25bb4a46787f55adcad3a46
11 changes: 8 additions & 3 deletions lib/Controller/EndpointController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,15 @@ public function deleteNotification(int $id): DataResponse {
return new DataResponse(null, Http::STATUS_NOT_FOUND);
}

$deleted = $this->handler->deleteById($id, $this->getCurrentUser());
if ($deleted) {
$this->push->pushDeleteToDevice($this->getCurrentUser(), $id);
try {
$deleted = $this->handler->deleteById($id, $this->getCurrentUser());

if ($deleted) {
$this->push->pushDeleteToDevice($this->getCurrentUser(), $id);
}
} catch (NotificationNotFoundException $e) {
}

return new DataResponse();
}

Expand Down
1 change: 1 addition & 0 deletions lib/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public function deleteByUser(string $user): bool {
* @param string $user
* @param INotification|null $notification
* @return bool
* @throws NotificationNotFoundException
*/
public function deleteById(int $id, string $user, ?INotification $notification = null): bool {
if (!$notification instanceof INotification) {
Expand Down