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

Fix update request channel being set to wrong localised string #5462

Merged
merged 6 commits into from
May 8, 2023

Conversation

claucambra
Copy link
Collaborator

This PR does two things:

  1. Fix a check that would led to a bad comparison of the translated channel with the config-stored channel
  2. More safely return the update channel to set in the config file from the input in the settings combo box, defaulting to stable where possible
  3. Prevent setting or returning of bad update channels from the config file

Fixes #5455

@claucambra claucambra self-assigned this Feb 22, 2023
@claucambra claucambra changed the title Fix update channel being set to wrong localised string Fix update requiest channel being set to wrong localised string Feb 22, 2023
@claucambra claucambra changed the title Fix update requiest channel being set to wrong localised string Fix update request channel being set to wrong localised string Feb 22, 2023
@codecov
Copy link

codecov bot commented Feb 22, 2023

Codecov Report

Merging #5462 (09d71b6) into master (c1bfd8b) will increase coverage by 0.01%.
The diff coverage is 19.23%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5462      +/-   ##
==========================================
+ Coverage   59.24%   59.25%   +0.01%     
==========================================
  Files         143      143              
  Lines       18445    18450       +5     
==========================================
+ Hits        10928    10933       +5     
  Misses       7517     7517              
Impacted Files Coverage Δ
src/libsync/clientsideencryption.cpp 41.25% <0.00%> (+0.40%) ⬆️
src/libsync/clientsideencryption.h 35.71% <ø> (ø)
src/libsync/configfile.cpp 26.19% <0.00%> (-0.31%) ⬇️
src/libsync/owncloudpropagator.cpp 84.62% <0.00%> (-0.33%) ⬇️
src/libsync/syncengine.cpp 80.73% <33.33%> (-0.21%) ⬇️
src/libsync/account.cpp 36.08% <60.00%> (+0.22%) ⬆️
src/libsync/account.h 40.00% <100.00%> (+3.15%) ⬆️

... and 1 file with indirect coverage changes

src/gui/generalsettings.cpp Show resolved Hide resolved
src/gui/generalsettings.cpp Outdated Show resolved Hide resolved
src/libsync/configfile.cpp Outdated Show resolved Hide resolved
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

5.3% 5.3% Coverage
0.0% 0.0% Duplication

claucambra added 6 commits May 8, 2023 19:06
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
… more safely

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
…ateChannels QSet

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the bugfix/updater-channel-string branch from ead4b3e to 09d71b6 Compare May 8, 2023 11:07
@claucambra
Copy link
Collaborator Author

/backport to stable-3.8

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5462-09d71b6a1d42ce2372930b68de3db3a3e89b3e92-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.

@sonarqubecloud
Copy link

sonarqubecloud bot commented May 8, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

5.3% 5.3% Coverage
0.0% 0.0% Duplication

@claucambra claucambra merged commit 5beba91 into master May 8, 2023
@claucambra claucambra deleted the bugfix/updater-channel-string branch May 8, 2023 12:03
@mgallien mgallien added this to the 3.9.0 milestone May 10, 2023
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.

[Bug]: client does not notify about new version (3.6.4)
5 participants