Skip to content

save proxy settings when setting them #13

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

save proxy settings when setting them #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,5 @@ doc/codeattributions.qdoc
/src/sdk/installerbase.qrc
/src/sdk/translations/untranslated.ts
/src/sdk/translations/ifw_en.ts

package/*
35 changes: 28 additions & 7 deletions src/libs/installer/packagemanagercore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3862,7 +3862,7 @@ QString PackageManagerCore::getProxyMode() const
return QStringLiteral("system");
break;
case Settings::UserDefinedProxy:
return QStringLiteral("manual");
return QStringLiteral("custom");
break;
}
}
Expand All @@ -3877,15 +3877,14 @@ void PackageManagerCore::setProxyMode(const QString &proxyType)
{
d->m_data.settings().setProxyType(QInstaller::Settings::SystemProxy);
}
else if(proxyType == QStringLiteral("manual"))
else if(proxyType == QStringLiteral("custom"))
{
d->m_data.settings().setProxyType(QInstaller::Settings::UserDefinedProxy);
}
else
{
qWarning() << "proxy mode does not exist";
}

}

QString PackageManagerCore::getHttpProxyHost() const
Expand All @@ -3900,6 +3899,7 @@ void PackageManagerCore::setHttpProxyHost(const QString &hostName)
{
QNetworkProxy proxy = d->m_data.settings().httpProxy();
proxy.setHostName(hostName);
d->m_data.settings().setHttpProxy(proxy);
qInfo() << "set proxy hostname" << proxy.hostName();
}

Expand All @@ -3916,7 +3916,16 @@ void PackageManagerCore::setHttpProxyPort(const QString &port)
QNetworkProxy proxy = d->m_data.settings().httpProxy();
bool boolVal;
proxy.setPort(port.toInt(&boolVal));
qInfo() << "set proxy port" << proxy.port();
if (boolVal)
{
d->m_data.settings().setHttpProxy(proxy);
qInfo() << "set proxy port" << proxy.port();
}
else
{
qWarning() << "unable to convert string to port: " << port;
}

}

QString PackageManagerCore::getHttpProxyUser() const
Expand All @@ -3931,7 +3940,7 @@ void PackageManagerCore::setHttpProxyUser(const QString &userName)
{
QNetworkProxy proxy = d->m_data.settings().httpProxy();
proxy.setUser(userName);
qInfo() << "set proxy port" << proxy.user();
d->m_data.settings().setHttpProxy(proxy);
}

QString PackageManagerCore::getHttpProxyPwd() const
Expand All @@ -3946,7 +3955,7 @@ void PackageManagerCore::setHttpProxyPwd(const QString &password)
{
QNetworkProxy proxy = d->m_data.settings().httpProxy();
proxy.setPassword(password);
qInfo() << "set proxy port" << proxy.password();
d->m_data.settings().setHttpProxy(proxy);
}

bool PackageManagerCore::getHttpProxyAuth() const
Expand Down Expand Up @@ -3976,12 +3985,14 @@ void PackageManagerCore::setFtpProxyHost(const QString &hostName)
{
QNetworkProxy proxy = d->m_data.settings().ftpProxy();
proxy.setHostName(hostName);
d->m_data.settings().setFtpProxy(proxy);
qInfo() << "set proxy hostname" << proxy.hostName();
}

QString PackageManagerCore::getFtpProxyPort() const
{
QNetworkProxy proxy = d->m_data.settings().ftpProxy();

qInfo() << "installer value: proxy port" << proxy.port();

return QString::number(proxy.port());
Expand All @@ -3992,7 +4003,15 @@ void PackageManagerCore::setFtpProxyPort(const QString &port)
QNetworkProxy proxy = d->m_data.settings().ftpProxy();
bool boolVal;
proxy.setPort(port.toInt(&boolVal));
qInfo() << "set proxy port" << proxy.port();
if (boolVal)
{
d->m_data.settings().setFtpProxy(proxy);
qInfo() << "set proxy port" << proxy.port();
}
else
{
qWarning() << "unable to convert string to port: " << port;
}
}

QString PackageManagerCore::getFtpProxyUser() const
Expand All @@ -4007,6 +4026,7 @@ void PackageManagerCore::setFtpProxyUser(const QString &userName)
{
QNetworkProxy proxy = d->m_data.settings().ftpProxy();
proxy.setUser(userName);
d->m_data.settings().setFtpProxy(proxy);
qInfo() << "set proxy port" << proxy.user();
}

Expand All @@ -4022,6 +4042,7 @@ void PackageManagerCore::setFtpProxyPwd(const QString &password)
{
QNetworkProxy proxy = d->m_data.settings().ftpProxy();
proxy.setPassword(password);
d->m_data.settings().setFtpProxy(proxy);
qInfo() << "set proxy port" << proxy.password();
}

Expand Down