mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 04:45:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Implement saving proxy settings to account in network settings

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-06-28 19:22:00 +08:00
parent f9d0f435d1
commit f9b4c76b33
No known key found for this signature in database
GPG key ID: C839200C384636B0
1 changed files with 48 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/gui/networksettings.cpp
View file

@ -194,22 +194,47 @@ void NetworkSettings::saveProxySettings()
ConfigFile cfgFile;
checkEmptyProxyHost();
const auto useGlobalProxy = _ui->globalProxySettingsRadioButton->isChecked();
const auto user = _ui->userLineEdit->text();
const auto password = _ui->passwordLineEdit->text();
const auto host = _ui->hostLineEdit->text();
const auto port = _ui->portSpinBox->value();
const auto needsAuth = _ui->authRequiredcheckBox->isChecked();
auto proxyType = QNetworkProxy::NoProxy;
if (_ui->noProxyRadioButton->isChecked()) {
cfgFile.setProxyType(QNetworkProxy::NoProxy);
proxyType = QNetworkProxy::NoProxy;
} else if (_ui->systemProxyRadioButton->isChecked()) {
cfgFile.setProxyType(QNetworkProxy::DefaultProxy);
proxyType = QNetworkProxy::DefaultProxy;
} else if (_ui->manualProxyRadioButton->isChecked()) {
int type = _ui->typeComboBox->itemData(_ui->typeComboBox->currentIndex()).toInt();
QString host = _ui->hostLineEdit->text();
if (host.isEmpty())
type = QNetworkProxy::NoProxy;
bool needsAuth = _ui->authRequiredcheckBox->isChecked();
QString user = _ui->userLineEdit->text();
QString pass = _ui->passwordLineEdit->text();
cfgFile.setProxyType(type, _ui->hostLineEdit->text(),
_ui->portSpinBox->value(), needsAuth, user, pass);
proxyType = _ui->typeComboBox->itemData(_ui->typeComboBox->currentIndex()).value<QNetworkProxy::ProxyType>();
if (host.isEmpty()) {
proxyType = QNetworkProxy::NoProxy;
}
}
if (_account) { // We must be setting up network proxy for a specific account
_account->setNetworkProxySetting(useGlobalProxy ? Account::AccountNetworkProxySetting::GlobalProxy : Account::AccountNetworkProxySetting::AccountSpecificProxy);
_account->setProxyType(proxyType);
_account->setProxyHostName(host);
_account->setProxyPort(_ui->portSpinBox->value());
_account->setProxyNeedsAuth(needsAuth);
_account->setProxyUser(user);
_account->setProxyPassword(password);
if (useGlobalProxy) {
_account->networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
} else {
const auto proxy = QNetworkProxy(proxyType, host, port, user, password);
_account->networkAccessManager()->setProxy(proxy);
}
const auto accountState = AccountManager::instance()->accountFromUserId(_account->userIdAtHostWithPort());
accountState->freshConnectionAttempt();
} else {
cfgFile.setProxyType(proxyType, host, port, needsAuth, user, password);
ClientProxy proxy;
proxy.setupQtProxyFromConfig(); // Refresh the Qt proxy settings as the
// quota check can happen all the time.
@ -219,8 +244,11 @@ void NetworkSettings::saveProxySettings()
FolderMan::instance()->setDirtyProxy();
const auto accounts = AccountManager::instance()->accounts();
for (auto account : accounts) {
account->freshConnectionAttempt();
for (const auto &accountState : accounts) {
if (accountState->account()->networkProxySetting() == Account::AccountNetworkProxySetting::GlobalProxy) {
accountState->freshConnectionAttempt();
}
}
}
}