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

oc desktop client login migration to nc desktop client login #5959

Merged
merged 5 commits into from
Sep 1, 2023

Conversation

camilasan
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Aug 7, 2023

Codecov Report

Merging #5959 (0936201) into master (f5cdb5d) will decrease coverage by 0.21%.
The diff coverage is 94.44%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5959      +/-   ##
==========================================
- Coverage   60.29%   60.08%   -0.21%     
==========================================
  Files         145      145              
  Lines       18838    18838              
==========================================
- Hits        11358    11319      -39     
- Misses       7480     7519      +39     
Files Changed Coverage Δ
src/libsync/configfile.cpp 28.66% <94.44%> (+1.57%) ⬆️

... and 10 files with indirect coverage changes

@camilasan camilasan force-pushed the bugfix/oc-account-login branch 3 times, most recently from f6cc299 to 7daeec9 Compare August 16, 2023 18:13
@camilasan camilasan changed the title oc deskopt client login migration to nc desktop client login oc desktop client login migration to nc desktop client login Aug 16, 2023
@camilasan camilasan force-pushed the bugfix/oc-account-login branch 3 times, most recently from 88cc6de to 426a61b Compare August 30, 2023 16:35
@camilasan
Copy link
Member Author

nextcloud/docker-ci#583

@camilasan camilasan force-pushed the bugfix/oc-account-login branch 2 times, most recently from 8f85884 to 54b5635 Compare August 31, 2023 15:22
@camilasan camilasan marked this pull request as ready for review August 31, 2023 15:23
@camilasan camilasan force-pushed the bugfix/oc-account-login branch 2 times, most recently from 77f5e8c to 300e850 Compare August 31, 2023 22:07
src/gui/folderman.cpp Outdated Show resolved Hide resolved
src/gui/folderman.cpp Outdated Show resolved Hide resolved
src/gui/folderman.cpp Outdated Show resolved Hide resolved
src/gui/folderman.cpp Outdated Show resolved Hide resolved
src/gui/userinfo.cpp Outdated Show resolved Hide resolved
src/gui/userinfo.cpp Outdated Show resolved Hide resolved
src/libsync/configfile.cpp Outdated Show resolved Hide resolved
@camilasan camilasan force-pushed the bugfix/oc-account-login branch 2 times, most recently from b204303 to 2c6efe7 Compare September 1, 2023 10:24
src/gui/folder.cpp Outdated Show resolved Hide resolved
src/gui/folderman.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@allexzander allexzander left a comment

Choose a reason for hiding this comment

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

@camilasan please do not forget to squash

Camila added 5 commits September 1, 2023 15:09
- Add {} for single line condition, const auto and fix comments.
- Save the legacy account data first in _settingsMap, so the legacy config file
does not get changed in the migration process.
- Legacy dav_user should stay only as dav_user in the new config.
- Compare davUser and prettyName only when new user id needs to be retrieved.

Signed-off-by: Camila <[email protected]>
- Migrate only the current config in use by the legacy application.

Signed-off-by: Camila <[email protected]>
- Refactor migration of blacklisted folders.
- Only change selective sync list if needed.

Signed-off-by: Camila <[email protected]>
- Refactor ConfigFile::setupDefaultExcludeFilePaths.
- Refactor ConfigFile::excludeFile.
- Fix code style.

Signed-off-by: Camila <[email protected]>
- Always used a sqlite compiled version or a version from KDE Craft
- When building the AppImage copy the sqlite files to the
/usr/lib/ folder in it.

Signed-off-by: Camila <[email protected]>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5959-0936201d804b2abb57d240a22e0e0c55cf1d1af3-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.

@sonarcloud
Copy link

sonarcloud bot commented Sep 1, 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 9 Code Smells

18.2% 18.2% Coverage
0.0% 0.0% Duplication

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

@camilasan camilasan merged commit c384513 into master Sep 1, 2023
11 of 12 checks passed
@camilasan camilasan deleted the bugfix/oc-account-login branch September 1, 2023 13:53
@mgallien mgallien added this to the 3.10.0 milestone Sep 7, 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.

5 participants