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

Feature/per account connection settings #6890

Merged
merged 49 commits into from
Jul 22, 2024
Merged

Feature/per account connection settings #6890

merged 49 commits into from
Jul 22, 2024

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Jul 9, 2024 •
edited
Loading

Screenshot 2024-07-09 at 14 32 26

Closes #6571

@claucambra claucambra self-assigned this Jul 9, 2024
@claucambra claucambra force-pushed the feature/per-account-connection-settings branch 2 times, most recently from a55aa8d to 4bb53ce Compare July 9, 2024 06:34
camilasan
camilasan approved these changes Jul 22, 2024
View reviewed changes
Copy link
Member

@camilasan camilasan left a comment

Choose a reason for hiding this comment

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

Squash some of the commits.

@claucambra
Add connection settings tab to account settings
63f15de 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Present network settings component within connection settings tab in …
88d2064 
…account settings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add AccountNetworkProxySetting enum to account
ae1b9bd 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add AccountNetworkTransferLimitSetting enum to account
15bc9a4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add network proxy setting property to account
2501cdf 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add proxy type property to account
73dd000 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add proxy host name property to account
a4553f5 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add proxy port property to account
8c6a181 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add proxy needs auth property to account
daed4c7 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add proxy user property to account
c0cd839 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add proxy password property to account
56b8fcf 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add upload limit setting property to account
7a9fd72 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add download limit setting property to account
f96fe64 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add upload limit property to account
d06e8b1 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add download limit setting property to account
35bc728 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Save and restore account-specific network settings in account maanger
3956612 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Take account-specific network configuration into account in proxyauth…
03946a8 
…handler

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add account member to network settings
dd71436 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Load in account specific network settings in network settings widget
fe031a1 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Adapt network settings loadBwLimitSettings for account-specific settings
f9d0f43 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Implement saving proxy settings to account in network settings
f9b4c76 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Respect account proxy settings in owncloudsetupwizard server check
8dabae6 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Respect account proxy settings in connectionvalidator
ac98197 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
When generally setting dirty proxy in folderman only mark dirty those…
8e9e125 
… that follow general client proxy settings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix account-specific network setting enum values
ab1d02d 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Modify network access manager proxy within account when setting proxy…
04f335e 
… values

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clean up networksettings saveProxySettings
b14b86e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Save bwlimits for account-specific network configuration
97f31a2 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Respect account-specific transfer limits in folder
480828b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Correctly load global proxy setting state on account-specific network…
9c856d2 
… settings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Store accounts' proxy passwords in keychain
770beba 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use single-defined constexpr string for proxy password keychain key
e3b002a 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure keychain chunk jobs in account manager run as intended
5db01d4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
KeychainChunk job exec is synchronous, do not bother with signals in …
2803690 
…account manager use

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Get intended default values for bw limit settings for account when no…
2d0c069 
…thing is set

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use better keychain chunk job constructors
01f8199 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Simplify proxy password keychain keys
70e7bcf 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add logging on error for proxy password saving
a8c5cbc 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure per-account network settings are saved on change
68cff89 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Move folder status model initialisation to member init list in Accoun…
5c0c2af 
…tSettings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure file provider tab is not shown when file provider module not e…
5b8f9e4 
…nabled

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use an AccountPtr instead of raw pointer in networksettings
926c3b6 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add a method to set a specific account's folders' network limits as d…
5bc6388 
…irty

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use qtkeychain directly in account manager
ef59399 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use full user id at host with port for proxy password keychain
37c77d8 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove now unused disguiseTabWidget
564be17 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the feature/per-account-connection-settings branch from 6f760f4 to 564be17 Compare July 22, 2024 07:38
@claucambra
Use application proxy when setting global proxy setting via network s…
eeb9cc2 
…ettings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Move all proxy configuration procedures into account and out of netwo…
7dec7b2 
…rk settings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the feature/per-account-connection-settings branch from 308b0ec to 7dec7b2 Compare July 22, 2024 08:34
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6890-7dec7b26a018836d66e67bb9e743d0e861cb401f-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 SonarCloud
Copy link

sonarcloud bot commented Jul 22, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
2.7% Coverage on New Code (required ≥ 80%)
71 New Code Smells (required ≤ 0)
D Security Rating on New Code (required ≥ A)

See analysis details on SonarCloud

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

@claucambra claucambra merged commit 59b4bba into master Jul 22, 2024
13 of 16 checks passed
@claucambra claucambra deleted the feature/per-account-connection-settings branch July 22, 2024 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camilasan camilasan camilasan approved these changes

@mgallien mgallien Awaiting requested review from mgallien

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

🔢 Multiple Proxy-Settings
3 participants
@claucambra @nextcloud-desktop-bot @camilasan