save proxy settings when setting them

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
   build_installer:
     permissions:
       contents: write  
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         - name: download packages
@@ -29,7 +29,7 @@ jobs:
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         - run: mkdir -p ${{env.BUILD_OUTPUT_PATH}}
-
+          
         - shell: cmd
           run: .\scripts\installer-build.bat
 

.gitignore

@@ -96,3 +96,5 @@ doc/codeattributions.qdoc
 /src/sdk/installerbase.qrc
 /src/sdk/translations/untranslated.ts
 /src/sdk/translations/ifw_en.ts
+
+package/*

scripts/installer-build.bat

@@ -1,7 +1,7 @@
 @echo on
 SetLocal EnableDelayedExpansion
 REM set msvc env
-CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
 
 REM set env path
 set path=%path%;%~dp0..\package\qt-static-6.6.0\bin

src/libs/installer/packagemanagercore.cpp

@@ -3885,7 +3885,6 @@ void PackageManagerCore::setProxyMode(const QString &proxyType)
     {
         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();
 }
 

src/sdk/sdkapp.h

@@ -269,9 +269,6 @@ 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)) {
             m_core->settings().setProxyType(QInstaller::Settings::UserDefinedProxy);
             // get proxy type, name, port
@@ -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)) {