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

Add maximum.supported.desktop.version #41183

Closed
wants to merge 11 commits into from

Conversation

flooxo
Copy link

@flooxo flooxo commented Oct 29, 2023

Summary

Add new config parameter maximum.supported.desktop.version (similar to minimum.supported.desktop.version) in order to prevent sync issues after updates (like nextcloud/desktop#4016 or nextcloud/desktop#5564)

Checklist

Signed-off-by: Florian Grabmeier <[email protected]>
apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php Outdated Show resolved Hide resolved
@szaimen szaimen added enhancement 3. to review Waiting for reviews labels Oct 29, 2023
@szaimen szaimen added this to the Nextcloud 28 milestone Oct 29, 2023
@szaimen szaimen requested review from a team, ArtificialOwl, icewind1991 and sorbaugh and removed request for a team October 29, 2023 12:49
@szaimen szaimen dismissed their stale review October 30, 2023 10:32

Resolved

flooxo and others added 2 commits October 30, 2023 11:42
Co-authored-by: Simon L. <[email protected]>
Signed-off-by: flox_x <[email protected]>
Signed-off-by: Florian Grabmeier <[email protected]>
@flooxo flooxo force-pushed the feature/max-version branch from ba23f6b to ed0bcc9 Compare October 30, 2023 10:43
@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
@flooxo
Copy link
Author

flooxo commented Nov 5, 2023

I hope now it's as intended :)

@blizzz blizzz mentioned this pull request Nov 6, 2023
@blizzz blizzz mentioned this pull request Nov 10, 2023
@blizzz blizzz mentioned this pull request Nov 14, 2023
@blizzz blizzz mentioned this pull request Nov 20, 2023
5 tasks
@flooxo flooxo requested a review from szaimen November 22, 2023 13:57
@blizzz blizzz removed this from the Nextcloud 28 milestone Nov 23, 2023
@blizzz blizzz added this to the Nextcloud 29 milestone Nov 23, 2023
This was referenced Mar 12, 2024
@skjnldsv skjnldsv requested review from Altahrim and come-nc March 15, 2024 14:46
Comment on lines +72 to +74
version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1 ||
!empty($maximumSupportedDesktopVersion) &&
version_compare($versionMatches[1], $maximumSupportedDesktopVersion) === 1) {
Copy link
Member

Choose a reason for hiding this comment

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

Mixing && and || is confusing, can you add parenthesis to isolate the checks?
Or regroup the checks into dedicated variables :)

You can also probably use a crazy versio number as maximum fallback, like

- $maximumSupportedDesktopVersion = $this->config->getSystemValueString('maximum.supported.desktop.version', '');
+ $maximumSupportedDesktopVersion = $this->config->getSystemValueString('maximum.supported.desktop.version', '99.99.99');

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think it will be better with two different error messages if the client is too old or too new.
It will help for debugging and solve the missing parenthesis

Copy link
Member

Choose a reason for hiding this comment

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

Seconded! 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

Same. Good otherwise.

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Mar 15, 2024
@skjnldsv skjnldsv modified the milestones: Nextcloud 29, Nextcloud 30 Mar 15, 2024
This was referenced Jul 30, 2024
@Altahrim Altahrim mentioned this pull request Aug 5, 2024
@skjnldsv skjnldsv modified the milestones: Nextcloud 30, Nextcloud 31 Aug 6, 2024
@skjnldsv
Copy link
Member

/backport! a0a7ce6 b998f98 ed0bcc9 to master

@skjnldsv
Copy link
Member

Moving to a local branch to take over and et this in :)

Copy link

backportbot bot commented Nov 27, 2024

The backport to master failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout master
git pull origin master

# Create the new backport branch
git checkout -b backport/41183/master

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick a0a7ce64 b998f98d ed0bcc96

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/41183/master

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed


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

@skjnldsv
Copy link
Member

alright 😁

@skjnldsv
Copy link
Member

#49517

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

Successfully merging this pull request may close these issues.

Add 'maximum.supported.desktop.version' parameter
6 participants