feat: MI0698-1660 add networkChanged flag to enable/disable writeMaintenanceConfigFiles

Author: JasonSun0593

src/libs/installer/packagemanagercore.cpp

@@ -516,7 +516,10 @@ void PackageManagerCore::writeMaintenanceTool()
 */
 void PackageManagerCore::writeMaintenanceConfigFiles()
 {
-    d->writeMaintenanceConfigFiles();
+    if(networkChanged())
+    {
+        d->writeMaintenanceConfigFiles();
+    }
 }
 
 /*!
@@ -938,6 +941,16 @@ void PackageManagerCore::setNeedsHardRestart(bool needsHardRestart)
     d->m_needsHardRestart = needsHardRestart;
 }
 
+bool PackageManagerCore::networkChanged() const
+{
+    return d->m_networkSettingChanged;
+}
+
+void PackageManagerCore::setNetworkChanged(bool networkChanged)
+{
+    d->m_networkSettingChanged = networkChanged;
+}
+
 /*!
     Cancels the installation and performs the UNDO step of all already executed
     operations.

src/libs/installer/packagemanagercore.h

@@ -394,6 +394,10 @@ class INSTALLER_EXPORT PackageManagerCore : public QObject
 
     bool needsHardRestart() const;
     void setNeedsHardRestart(bool needsHardRestart = true);
+
+    bool networkChanged() const;
+    void setNetworkChanged(bool networkChanged = true);
+
     bool finishedWithSuccess() const;
 
     QStringList filesForDelayedDeletion() const;

src/libs/installer/packagemanagercore_p.cpp

@@ -220,6 +220,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q
     , m_checkAvailableSpace(true)
     , m_completeUninstall(false)
     , m_needToWriteMaintenanceTool(false)
+    , m_networkSettingChanged(false)
     , m_dependsOnLocalInstallerBinary(false)
     , m_autoAcceptLicenses(false)
     , m_disableWriteMaintenanceTool(false)

src/libs/installer/packagemanagercore_p.h

@@ -220,6 +220,7 @@ class PackageManagerCorePrivate : public QObject
     bool m_checkAvailableSpace;
     bool m_completeUninstall;
     bool m_needToWriteMaintenanceTool;
+    bool m_networkSettingChanged;
     PackageManagerCoreData m_data;
     QString m_installerBaseBinaryUnreplaced;
     QString m_offlineBaseBinaryUnreplaced;

src/sdk/sdkapp.h

@@ -269,9 +269,11 @@ class SDKApp : public T
         if (m_parser.isSet(CommandLineOptions::scNoProxyLong)) {
             m_core->settings().setProxyType(QInstaller::Settings::NoProxy);
             KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
+            m_core->setNetworkChanged(true);
         } else if (QNetworkProxyFactory::usesSystemConfiguration()) {
             m_core->settings().setProxyType(QInstaller::Settings::SystemProxy);
             KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
+            m_core->setNetworkChanged(true);
         } else if(m_parser.isSet(CommandLineOptions::scManualProxyLong)) {
             m_core->settings().setProxyType(QInstaller::Settings::UserDefinedProxy);
             // get proxy type, name, port
@@ -336,6 +338,7 @@ class SDKApp : public T
                 errorMessage = QObject::tr("Manual proxy name and portId need to be specifed.");
                 return false;
             }
+            m_core->setNetworkChanged(true);  //mark m_networkSettingChanged flag as true for writeMaintenanceConfigFiles to work
 
         }
 

src/sdk/tabcontroller.cpp

@@ -268,4 +268,5 @@ void TabController::onNetworkSettingsChanged(const QInstaller::Settings &setting
 {
     d->m_settings = settings;
     d->m_networkSettingsChanged = true;
+    d->m_core->setNetworkChanged(true);
 }