Skip to content
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

Bugfix/update encryption state when server change #6841

Merged
merged 3 commits into from
Jun 26, 2024

Conversation

mgallien
Copy link
Collaborator

No description provided.

might be that the server previously supported e2ee and e2ee folders
exist

so we have to fetch the info to properly handle it on client

Signed-off-by: Matthieu Gallien <[email protected]>
when we know a folder should be encrypted but encryption client side app
is disabled, ignore any items in the encrypted folders

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
Copy link
Collaborator Author

/backport to stable-3.12

@mgallien
Copy link
Collaborator Author

/backport to stable-3.13

@mgallien mgallien merged commit ad70745 into master Jun 26, 2024
11 of 13 checks passed
@mgallien mgallien deleted the bugfix/updateEncryptionStateWhenServerChange branch June 26, 2024 12:49
Copy link

backportbot bot commented Jun 26, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6841/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 284823d1 a270dca3 863256fd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6841/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6841-863256fd5503d73c140ba91f5cd2140de9c5f713-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link

sonarcloud bot commented Jun 26, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants