Desktop: Fixes #11594: Fix syncLockGoneError on sync with certain share configs #11611
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
…rtain share config Note: I was able to reproduce the original issue with the following steps: 1. Create two users on the same team (team user A, team user B). 2. Enable end-to-end encryption for both users. 3. Share a notebook in read-only mode from user A to user B. 4. Accept the share and sync. 5. Share a notebook in writable mode from user B to user A. 6. Accept the share and sync. 7. As user A, make a change to a note from the notebook shared in step 5. - Specifically, mark a previously complete task as incomplete. 8. Sync. 9. Observe the "syncLockGone" error. While this commit seems to fix the error, all changes made from user A to the modifiable notebook from step 5 are marked as conflicts and unapplied on sync. As such, I suspect that there is also a bug related to local (app not server) handling of sync permissions in the 3.2 release.
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.
Summary
Sync lock support is now disabled by default. As a result, a sync error is not necessarily related to sync locks if no sync lock is present.
This pull request partially resolves #11594.
Testing plan
Note
While this commit seems to fix the error, all changes made from user A to the modifiable notebook from step 5 are marked as conflicts (e.g. the change in step 14) and unapplied on sync. As such, I suspect that there is also a bug related to local (app not server) handling of sync permissions in the 3.2 release.