save proxy settings when setting them

JelleDhaene89 · JelleDhaene89 · commit 5404b76d64cd · 2025-06-03T16:09:11.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -96,3 +96,5 @@ doc/codeattributions.qdoc
 /src/sdk/installerbase.qrc
 /src/sdk/translations/untranslated.ts
 /src/sdk/translations/ifw_en.ts
+
+package/*
diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp
@@ -122,7 +122,7 @@ CommandLineParser::CommandLineParser()
 
     // Starting mode options
     addOption(QCommandLineOption(QStringList()
-        << CommandLineOptions::scManualProxyShort << CommandLineOptions::scManualProxyLong,
+        << CommandLineOptions::scCustomProxyShort << CommandLineOptions::scCustomProxyLong,
         QLatin1String("Use manual proxy.")));
 
     // Custom Proxy options
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
@@ -235,8 +235,8 @@ static const QLatin1String scSystemProxyShort("sp");
 static const QLatin1String scSystemProxyLong("system-proxy");
 static const QLatin1String scNoProxyShort("np");
 static const QLatin1String scNoProxyLong("no-proxy");
-static const QLatin1String scManualProxyShort("mp");
-static const QLatin1String scManualProxyLong("manual-proxy");
+static const QLatin1String scCustomProxyShort("cpr");
+static const QLatin1String scCustomProxyLong("custom-proxy");
 
 // Custom Proxy options
 static const QLatin1String scHttpProxyHostNameShort("hph");
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
@@ -3862,7 +3862,7 @@ QString PackageManagerCore::getProxyMode() const
             return QStringLiteral("system");
             break;
         case Settings::UserDefinedProxy:
-            return QStringLiteral("manual");
+            return QStringLiteral("custom");
             break;
     }
 }
@@ -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
@@ -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();
 }
 
@@ -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
@@ -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
@@ -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
@@ -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());
@@ -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
@@ -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();
 }
 
@@ -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();
 }
 
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
             QNetworkProxyFactory::setUseSystemConfiguration(false);
         }
 
-        if ((parser.isSet(CommandLineOptions::scNoProxyLong)) || (parser.isSet(CommandLineOptions::scManualProxyLong)))
+        if ((parser.isSet(CommandLineOptions::scNoProxyLong)) || (parser.isSet(CommandLineOptions::scCustomProxyLong)))
             QNetworkProxyFactory::setUseSystemConfiguration(false);
 
         const SelfRestarter restarter(argc, argv);
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
@@ -269,10 +269,7 @@ class SDKApp : public T
         if (m_parser.isSet(CommandLineOptions::scNoProxyLong)) {
             m_core->settings().setProxyType(QInstaller::Settings::NoProxy);
             KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
-        } else if (QNetworkProxyFactory::usesSystemConfiguration()) {
-            m_core->settings().setProxyType(QInstaller::Settings::SystemProxy);
-            KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
-        } else if(m_parser.isSet(CommandLineOptions::scManualProxyLong)) {
+        } else if(m_parser.isSet(CommandLineOptions::scCustomProxyLong)) {
             m_core->settings().setProxyType(QInstaller::Settings::UserDefinedProxy);
             // get proxy type, name, port
             if ((m_parser.isSet(CommandLineOptions::scHttpProxyHostNameLong)) && (m_parser.isSet(CommandLineOptions::scPortIdLong))) {
@@ -336,7 +333,9 @@ class SDKApp : public T
                 errorMessage = QObject::tr("Manual proxy name and portId need to be specifed.");
                 return false;
             }
-
+        } else if (QNetworkProxyFactory::usesSystemConfiguration()) {
+            m_core->settings().setProxyType(QInstaller::Settings::SystemProxy);
+            KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
         }
 
         if (m_parser.isSet(CommandLineOptions::scLocalCachePathLong)) {

Original file line number	Diff line number	Diff line change
`@@ -3862,7 +3862,7 @@ QString PackageManagerCore::getProxyMode() const`
`3862`	`3862`	`return QStringLiteral("system");`
`3863`	`3863`	`break;`
`3864`	`3864`	`case Settings::UserDefinedProxy:`
`3865`		`- return QStringLiteral("manual");`
	`3865`	`+ return QStringLiteral("custom");`
`3866`	`3866`	`break;`
`3867`	`3867`	`}`
`3868`	`3868`	`}`
`@@ -3877,15 +3877,14 @@ void PackageManagerCore::setProxyMode(const QString &proxyType)`
`3877`	`3877`	`{`
`3878`	`3878`	`d->m_data.settings().setProxyType(QInstaller::Settings::SystemProxy);`
`3879`	`3879`	`}`
`3880`		`- else if(proxyType == QStringLiteral("manual"))`
	`3880`	`+ else if(proxyType == QStringLiteral("custom"))`
`3881`	`3881`	`{`
`3882`	`3882`	`d->m_data.settings().setProxyType(QInstaller::Settings::UserDefinedProxy);`
`3883`	`3883`	`}`
`3884`	`3884`	`else`
`3885`	`3885`	`{`
`3886`	`3886`	`qWarning() << "proxy mode does not exist";`
`3887`	`3887`	`}`
`3888`		`-`
`3889`	`3888`	`}`
`3890`	`3889`
`3891`	`3890`	`QString PackageManagerCore::getHttpProxyHost() const`
`@@ -3900,6 +3899,7 @@ void PackageManagerCore::setHttpProxyHost(const QString &hostName)`
`3900`	`3899`	`{`
`3901`	`3900`	`QNetworkProxy proxy = d->m_data.settings().httpProxy();`
`3902`	`3901`	`proxy.setHostName(hostName);`
	`3902`	`+ d->m_data.settings().setHttpProxy(proxy);`
`3903`	`3903`	`qInfo() << "set proxy hostname" << proxy.hostName();`
`3904`	`3904`	`}`
`3905`	`3905`
`@@ -3916,7 +3916,16 @@ void PackageManagerCore::setHttpProxyPort(const QString &port)`
`3916`	`3916`	`QNetworkProxy proxy = d->m_data.settings().httpProxy();`
`3917`	`3917`	`bool boolVal;`
`3918`	`3918`	`proxy.setPort(port.toInt(&boolVal));`
`3919`		`- qInfo() << "set proxy port" << proxy.port();`
	`3919`	`+ if (boolVal)`
	`3920`	`+ {`
	`3921`	`+ d->m_data.settings().setHttpProxy(proxy);`
	`3922`	`+ qInfo() << "set proxy port" << proxy.port();`
	`3923`	`+ }`
	`3924`	`+ else`
	`3925`	`+ {`
	`3926`	`+ qWarning() << "unable to convert string to port: " << port;`
	`3927`	`+ }`
	`3928`	`+`
`3920`	`3929`	`}`
`3921`	`3930`
`3922`	`3931`	`QString PackageManagerCore::getHttpProxyUser() const`
`@@ -3931,7 +3940,7 @@ void PackageManagerCore::setHttpProxyUser(const QString &userName)`
`3931`	`3940`	`{`
`3932`	`3941`	`QNetworkProxy proxy = d->m_data.settings().httpProxy();`
`3933`	`3942`	`proxy.setUser(userName);`
`3934`		`- qInfo() << "set proxy port" << proxy.user();`
	`3943`	`+ d->m_data.settings().setHttpProxy(proxy);`
`3935`	`3944`	`}`
`3936`	`3945`
`3937`	`3946`	`QString PackageManagerCore::getHttpProxyPwd() const`
`@@ -3946,7 +3955,7 @@ void PackageManagerCore::setHttpProxyPwd(const QString &password)`
`3946`	`3955`	`{`
`3947`	`3956`	`QNetworkProxy proxy = d->m_data.settings().httpProxy();`
`3948`	`3957`	`proxy.setPassword(password);`
`3949`		`- qInfo() << "set proxy port" << proxy.password();`
	`3958`	`+ d->m_data.settings().setHttpProxy(proxy);`
`3950`	`3959`	`}`
`3951`	`3960`
`3952`	`3961`	`bool PackageManagerCore::getHttpProxyAuth() const`
`@@ -3976,12 +3985,14 @@ void PackageManagerCore::setFtpProxyHost(const QString &hostName)`
`3976`	`3985`	`{`
`3977`	`3986`	`QNetworkProxy proxy = d->m_data.settings().ftpProxy();`
`3978`	`3987`	`proxy.setHostName(hostName);`
	`3988`	`+ d->m_data.settings().setFtpProxy(proxy);`
`3979`	`3989`	`qInfo() << "set proxy hostname" << proxy.hostName();`
`3980`	`3990`	`}`
`3981`	`3991`
`3982`	`3992`	`QString PackageManagerCore::getFtpProxyPort() const`
`3983`	`3993`	`{`
`3984`	`3994`	`QNetworkProxy proxy = d->m_data.settings().ftpProxy();`
	`3995`	`+`
`3985`	`3996`	`qInfo() << "installer value: proxy port" << proxy.port();`
`3986`	`3997`
`3987`	`3998`	`return QString::number(proxy.port());`
`@@ -3992,7 +4003,15 @@ void PackageManagerCore::setFtpProxyPort(const QString &port)`
`3992`	`4003`	`QNetworkProxy proxy = d->m_data.settings().ftpProxy();`
`3993`	`4004`	`bool boolVal;`
`3994`	`4005`	`proxy.setPort(port.toInt(&boolVal));`
`3995`		`- qInfo() << "set proxy port" << proxy.port();`
	`4006`	`+ if (boolVal)`
	`4007`	`+ {`
	`4008`	`+ d->m_data.settings().setFtpProxy(proxy);`
	`4009`	`+ qInfo() << "set proxy port" << proxy.port();`
	`4010`	`+ }`
	`4011`	`+ else`
	`4012`	`+ {`
	`4013`	`+ qWarning() << "unable to convert string to port: " << port;`
	`4014`	`+ }`
`3996`	`4015`	`}`
`3997`	`4016`
`3998`	`4017`	`QString PackageManagerCore::getFtpProxyUser() const`
`@@ -4007,6 +4026,7 @@ void PackageManagerCore::setFtpProxyUser(const QString &userName)`
`4007`	`4026`	`{`
`4008`	`4027`	`QNetworkProxy proxy = d->m_data.settings().ftpProxy();`
`4009`	`4028`	`proxy.setUser(userName);`
	`4029`	`+ d->m_data.settings().setFtpProxy(proxy);`
`4010`	`4030`	`qInfo() << "set proxy port" << proxy.user();`
`4011`	`4031`	`}`
`4012`	`4032`
`@@ -4022,6 +4042,7 @@ void PackageManagerCore::setFtpProxyPwd(const QString &password)`
`4022`	`4042`	`{`
`4023`	`4043`	`QNetworkProxy proxy = d->m_data.settings().ftpProxy();`
`4024`	`4044`	`proxy.setPassword(password);`
	`4045`	`+ d->m_data.settings().setFtpProxy(proxy);`
`4025`	`4046`	`qInfo() << "set proxy port" << proxy.password();`
`4026`	`4047`	`}`
`4027`	`4048`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ int main(int argc, char *argv[])`
`321`	`321`	`QNetworkProxyFactory::setUseSystemConfiguration(false);`
`322`	`322`	`}`
`323`	`323`
`324`		`- if ((parser.isSet(CommandLineOptions::scNoProxyLong)) \|\| (parser.isSet(CommandLineOptions::scManualProxyLong)))`
	`324`	`+ if ((parser.isSet(CommandLineOptions::scNoProxyLong)) \|\| (parser.isSet(CommandLineOptions::scCustomProxyLong)))`
`325`	`325`	`QNetworkProxyFactory::setUseSystemConfiguration(false);`
`326`	`326`
`327`	`327`	`const SelfRestarter restarter(argc, argv);`