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

Move ClientProxy and and ConnectionValidator out of libsync #312

Merged
merged 5 commits into from
Jun 1, 2018

Conversation

camilasan
Copy link
Member

@rullzer
Copy link
Member

rullzer commented May 31, 2018

conflict....

ogoffart added 5 commits May 31, 2018 21:56
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
So no need to have a manual conversion to QString
This is only used in debug message anyway.
@rullzer rullzer merged commit 335298f into master Jun 1, 2018
@rullzer rullzer deleted the upstream/pr/6374 branch June 1, 2018 09:08
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.

3 participants