-
Notifications
You must be signed in to change notification settings - Fork 120
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.
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
fix: Use Close_Session post message to properly end the Collabora editing before opening locally #3601
Merged
Conversation
This file contains 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
/backport! to stable27 |
2 tasks
/backport to stable29 |
/backport to stable28 |
max-nextcloud
approved these changes
Apr 16, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found a typo that should have no effect as it's consistent. Other than that seems good.
6e0f34d
to
7d2de39
Compare
…ting before opening locally Signed-off-by: Julius Härtl <jus@bitgrid.net>
7d2de39
to
bb0c847
Compare
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.
Forward port of #3597
If we edit locally we want to ensure that the document is saved and all sessions are removed before handing over the file to the desktop client. The previous approach was somewhat flaky and could lead to opening the file locally too early. The Close_Session post message will ensure that the file is properly terminated on the Collabora side and the lock on it is removed.
Further we can use the Session_Closed post message on other editing sessions to show a hint to the user why the document was auto-closed.
Steps to reproduce (with some back luck in timing):
Now before this change there was a high chance that if the save and termination of individual sessions took longer, Collabora hadn't fully closed the document and may have ended in a inconsistent state (either the client failed to lock or Collabora hasn't finished writing the document). With the new post message handling the Collabora side should be fully terminated before we handover.