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.

Sign up for GitHub

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

Jump to bottom

fix migration from old settings configuration files #5141

Merged
merged 9 commits into from
Dec 15, 2022
Merged

fix migration from old settings configuration files #5141

merged 9 commits into from
Dec 15, 2022

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Nov 7, 2022

Signed-off-by: Matthieu Gallien matthieu.gallien@nextcloud.com

@mgallien mgallien force-pushed the bugfix/upgradeFromOldClients branch 2 times, most recently from afa124f to c26e7b0 Compare November 7, 2022 22:54
@mgallien mgallien marked this pull request as draft November 8, 2022 08:39
@mgallien
Copy link
Collaborator Author

mgallien commented Nov 8, 2022

this is not working on windows

@claucambra claucambra marked this pull request as ready for review December 1, 2022 13:04
@claucambra
Copy link
Collaborator

@mgallien Should now work correctly

@claucambra claucambra self-assigned this Dec 1, 2022
@claucambra
Copy link
Collaborator

@mgallien pipeline fails because of use of QDesktopServices for legacy path, what to do?

@mgallien
Copy link
Collaborator Author

mgallien commented Dec 6, 2022

@mgallien pipeline fails because of use of QDesktopServices for legacy path, what to do?

@claucambra cannot we use QStandardPaths ?

@claucambra
Copy link
Collaborator

@mgallien pipeline fails because of use of QDesktopServices for legacy path, what to do?

@claucambra cannot we use QStandardPaths ?

Yes, done

@claucambra
Copy link
Collaborator

Looks good to me but since I worked on this it should probably have someone else review it too

@codecov
Copy link

codecov bot commented Dec 15, 2022 •
edited
Loading

Codecov Report

Merging #5141 (72ccda2) into master (a21df5b) will increase coverage by 0.01%.
The diff coverage is n/a.

❗ Current head 72ccda2 differs from pull request most recent head b0d048b. Consider uploading reports for the commit b0d048b to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #5141      +/-   ##
==========================================
+ Coverage   57.70%   57.72%   +0.01%     
==========================================
  Files         139      139              
  Lines       17577    17577              
==========================================
+ Hits        10143    10146       +3     
+ Misses       7434     7431       -3
Impacted Files Coverage Δ
src/libsync/discovery.cpp 87.83% <0.00%> (+0.29%) ⬆️

mgallien and others added 9 commits December 15, 2022 16:58
@mgallien @claucambra
fix migration from old settings configuration files
39f8521 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@claucambra
Add full list of possible legacy config locations
98be5fd 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Replace QDesktopServices datalocation with emulated version of it
5548a41 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix includes in accountmanager.cpp
0f9ddcd 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Constify config file QFileInfo, create directly in if statement
d8e8a43 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make checks for config file more concise, warn when file not readable
f4bca99 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use std::make_unique rather than manually build unique_ptr for oCSett…
14bd744 
…ings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Constify groups variable
3b7bd6d 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix conflicting definitions in anonymous namespace in Unity build
b0d048b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5141-b0d048b0b83f5bf6dea012ebf1b8d87c51e8a280-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 Dec 15, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 6 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@claucambra claucambra merged commit c03e6cc into master Dec 15, 2022
@claucambra claucambra deleted the bugfix/upgradeFromOldClients branch December 15, 2022 16:40
@mgallien mgallien added this to the 3.7.0 milestone Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@allexzander allexzander Awaiting requested review from allexzander

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.7.0
Development

Successfully merging this pull request may close these issues.
3 participants
@mgallien @claucambra @nextcloud-desktop-bot