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 new update channels part 2. #6790

Merged
merged 21 commits into from
Jul 4, 2024
Merged

Add new update channels part 2. #6790

merged 21 commits into from
Jul 4, 2024

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Jun 3, 2024

Fix https://github.com/nextcloud-gmbh/desktop/issues/26

This should:

  • check for server capability
    hasValidSubscription' => true,
    desktopEnterpriseChannel => stable/enterprise

  • if set -> Desktop asks update server for channel=enterprise

  • it is automatically enabled for all customer

  • user can still "downgrade" to stable (will then be remembered)

  • if the client is branded:

    • the option is always set to "stable"
    • do not upgrade to "enterprise"

@camilasan camilasan force-pushed the feature/update-channel-2 branch 3 times, most recently from 106bb08 to 952526a Compare July 3, 2024 22:22
src/gui/accountmanager.cpp Outdated Show resolved Hide resolved
src/gui/generalsettings.cpp Show resolved Hide resolved
src/gui/accountmanager.cpp Outdated Show resolved Hide resolved
src/gui/generalsettings.cpp Show resolved Hide resolved
src/gui/generalsettings.cpp Outdated Show resolved Hide resolved
src/libsync/configfile.cpp Show resolved Hide resolved
src/libsync/configfile.h Outdated Show resolved Hide resolved
src/libsync/theme.cpp Outdated Show resolved Hide resolved
src/libsync/configfile.cpp Outdated Show resolved Hide resolved
Signed-off-by: Camila Ayres <[email protected]>
The default should be what is returned by defaultUpdateChannel()
when desktopEnterpriseChannel is not available.

Signed-off-by: Camila Ayres <[email protected]>
…nd what info to show the user.

Signed-off-by: Camila Ayres <[email protected]>
Subscription and channel are supposed to be a general setting, not per user.

Signed-off-by: Camila Ayres <[email protected]>
@camilasan camilasan marked this pull request as ready for review July 4, 2024 08:20
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6790-9bd4ef1b83e1e7a93bc3017f01980e02ab739dfa-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.

@camilasan camilasan merged commit cb47b1b into master Jul 4, 2024
13 of 14 checks passed
@camilasan camilasan deleted the feature/update-channel-2 branch July 4, 2024 09:15
Copy link

sonarcloud bot commented Jul 4, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
50.0% Coverage on New Code (required ≥ 80%)
B Maintainability Rating on New Code (required ≥ A)
35 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

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.

5 participants