Rerequest push notifications#4174
Open
mpivchev wants to merge 3 commits into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Notification Service Extension to re-request the full notification payload from the Nextcloud server (using the notification ID from the push payload) so the displayed content is reconstructed for the logged-in user, matching Android/Desktop behavior and addressing issue #4145.
Changes:
- Decrypt push payload to identify the matching account and extract
nid, then fetch the up-to-date notification from the server. - Update the delivered notification title/body based on the server response when available.
- Add a single-delivery guard (
OSAllocatedUnfairLock+deliver()) to avoid double-calling the content handler (normal completion vs. time-expiry).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
mpivchev
commented
Jul 9, 2026
| } | ||
|
|
||
| private func deliver() { | ||
| let handler = deliveryLock.withLock { |
Collaborator
Author
There was a problem hiding this comment.
Lock is added as serviceExtensionTimeWillExpire comes from a different thread: https://developer.apple.com/documentation/usernotifications/unnotificationserviceextension/serviceextensiontimewillexpire()
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NCKit: nextcloud/NextcloudKit#231
Fixes #4145
Rerequest each notification from server so it's up to date. This resolves issue where a notification would show the wrong content.
serviceExtensionTimeWillExpiretimeout