Skip to content

fix(gui): only list kept read-only items in activities, not every ign… - #11207

Open
guruz wants to merge 1 commit into
nextcloud:masterfrom
guruz:master_fix_7797_followup
Open

guruz wants to merge 1 commit into
nextcloud:masterfrom
guruz:master_fix_7797_followup

Conversation

@guruz

@guruz guruz commented Nov 2, 2026

Copy link
Copy Markdown
Contributor

Resolves

Summary

Followup to @v3DJG6GL comment.

Checklist

AI (if applicable)

Status _status BITFIELD(4);
bool _isRestoration BITFIELD(1); // The original operation was forbidden, and this is a restoration
bool _isSelectiveSync BITFIELD(1); // The file is removed or ignored because it is in the selective sync list
bool _keptLocalOnlyData BITFIELD(1); // The upload was ignored, and the local-only data was kept on disk (new item in a read-only folder)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call it _isReadOnly
I think it tells more about the item than _keptLocalOnlyData

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@camilasan It's not the read only item/file :)
The read only items are the OTHER files in that directory that come from the server.
This is the (new) item that was (locally on desktop) copied by the user into the read only FOLDER.
And (before the original fix) it was deleted by the sync engine. Now it is kept (hence the name) by the sync engine so the user has a chance to rescue the file.
I'm open to other names if you don't like _keptLocalOnlyData.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

side note: The test case in testpermissions.cpp (of my original PR) is also called testNewLocalFileInReadOnlyFolderIsKept

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it, what about _isUploadForbidden?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we mix it to _isUploadForbiddenFileKept?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe Item instead of File

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I think that should work. thanks!

Comment thread test/testpermissions.cpp Resolved
Comment on lines +1468 to +1470
// The item could not be uploaded (it lives in a read-only folder) and its
// local-only data was kept on disk. Unlike other ignored items this is shown
// in the Not-synced list so the user can see why it never syncs.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you rename _keptLocalOnlyData to something more clear, this whole comments could be removed.

@camilasan camilasan added this to the 35.0.3 milestone Nov 2, 2026
@camilasan camilasan self-assigned this Nov 2, 2026
…ored file

This is a followup to nextcloud#10226
Introduces a proper flag for this read-only remote folder case.

Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Markus Goetz <markus@woboq.com>
@guruz
guruz force-pushed the master_fix_7797_followup branch from 5bfb9cd to 9a7ac17 Compare November 2, 2026 15:36
@claucambra claucambra modified the milestones: 35.0.3, 35.0.4 Nov 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants