Desktop,Mobile: Resolves #10073, #10080: Fix conflicts notebook doesn't work with the trash feature #10104
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
This pull request improves how conflicts are handled with the trash feature.
Fixes #10080 and #10073.
Notes
This PR does the following:
Missing property "deleted_time"
exception.getConflictFolderId
andgetTrashFolderId
into separate files to prevent a circular import issue.When a conflict is deleted to trash, it now
is_conflict = 1
)deleted_time ≠ 0
)When a conflict is restored from trash, it is moved back to the conflicts folder.
Remaining issues
I've noticed the following remaining issues that could be addressed in a follow-up pull request:
Testing
To manually test this change,
This has been tested successfully on Ubuntu 23.10.
On Android:
This has been tested successfully on Android 13.