Merge 4d8bba3ef8 into efcc0b7efc

client/ui/controllers/settingsController.cpp

@@ -35,6 +35,23 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
 #endif
 }
 
+QString getPlatformName()
+{
+#if defined(Q_OS_WINDOWS)
+    return "Windows";
+#elif defined(Q_OS_ANDROID)
+    return "Android";
+#elif defined(Q_OS_LINUX)
+    return "Linux";
+#elif defined(Q_OS_MACX)
+    return "MacOS";
+#elif defined(Q_OS_IOS)
+    return "iOS";
+#else
+    return "Unknown";
+#endif
+}
+
 void SettingsController::toggleAmneziaDns(bool enable)
 {
     m_settings->setUseAmneziaDns(enable);
@@ -130,7 +147,10 @@ void SettingsController::backupAppConfig(const QString &fileName)
     QJsonDocument doc = QJsonDocument::fromJson(data);
     QJsonObject config = doc.object();
 
+    config["AppPlatform"] = getPlatformName();
     config["Conf/autoStart"] = Autostart::isAutostart();
+    config["Conf/killSwitchEnabled"] = isKillSwitchEnabled();
+    config["Conf/strictKillSwitchEnabled"] = isStrictKillSwitchEnabled();
 
     SystemController::saveFile(fileName, QJsonDocument(config).toJson());
 }
@@ -155,21 +175,41 @@ void SettingsController::restoreAppConfigFromData(const QByteArray &data)
         }
         toggleAutoStart(autoStart);
 #endif
+
         m_serversModel->resetModel();
         m_languageModel->changeLanguage(
                 static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
 
 #if defined(Q_OS_WINDOWS) || defined(Q_OS_ANDROID)
         int appSplitTunnelingRouteMode = newConfigData.value("Conf/appsRouteMode").toInt();
-        bool appSplittunnelingEnabled = newConfigData.value("Conf/appsSplitTunnelingEnabled").toBool();
+        bool appSplittunnelingEnabled = newConfigData.value("Conf/appsSplitTunnelingEnabled").toString().toLower() == "true";
         m_appSplitTunnelingModel->setRouteMode(appSplitTunnelingRouteMode);
+
+        #if defined(Q_OS_WINDOWS)
+            m_appSplitTunnelingModel->setRouteMode(static_cast<int>(Settings::AppsRouteMode::VpnAllExceptApps));
+        #endif
+
+        if (newConfigData.contains("AppPlatform")) { //if backup is from a new version
+                if (newConfigData.value("AppPlatform").toString() != getPlatformName()) {
+                    m_appSplitTunnelingModel->clearAppsList();
+                }
+        }
+
         m_appSplitTunnelingModel->toggleSplitTunneling(appSplittunnelingEnabled);
 #endif
+
         int siteSplitTunnelingRouteMode = newConfigData.value("Conf/routeMode").toInt();
-        bool siteSplittunnelingEnabled = newConfigData.value("Conf/sitesSplitTunnelingEnabled").toBool();
+        bool siteSplittunnelingEnabled = newConfigData.value("Conf/sitesSplitTunnelingEnabled").toString().toLower() == "true";
         m_sitesModel->setRouteMode(siteSplitTunnelingRouteMode);
         m_sitesModel->toggleSplitTunneling(siteSplittunnelingEnabled);
 
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+        m_settings->setAutoConnect(false);
+        m_settings->setStartMinimized(false);
+        m_settings->setKillSwitchEnabled(false);
+        m_settings->setStrictKillSwitchEnabled(false);
+#endif
+
         emit restoreBackupFinished();
     } else {
         emit changeSettingsErrorOccurred(tr("Backup file is corrupted"));

client/ui/controllers/settingsController.h

@@ -136,6 +136,8 @@ private:
 
     QString m_appVersion;
 
+    QString getPlatform();
+
     QDateTime m_loggingDisableDate;
 
     bool m_isDevModeEnabled = false;

client/ui/models/appSplitTunnelingModel.cpp

@@ -26,12 +26,12 @@ QVariant AppSplitTunnelingModel::data(const QModelIndex &index, int role) const
         return QVariant();
 
     switch (role) {
-    case AppPathRole: {
+        case AppPathRole: {
-        return m_apps.at(index.row()).appName;
+            return m_apps.at(index.row()).appName;
-    }
+        }
-    default: {
+        default: {
-        return true;
+            return true;
-    }
+        }
     }
 
     return QVariant();
@@ -59,6 +59,13 @@ void AppSplitTunnelingModel::removeApp(QModelIndex index)
     endRemoveRows();
 }
 
+void AppSplitTunnelingModel::clearAppsList() {
+    beginResetModel();
+    m_apps.clear();
+    m_settings->setVpnApps(m_currentRouteMode, m_apps);
+    endResetModel();
+}
+
 int AppSplitTunnelingModel::getRouteMode()
 {
     return m_currentRouteMode;

client/ui/models/appSplitTunnelingModel.h

@@ -29,6 +29,7 @@ public:
 public slots:
     bool addApp(const InstalledAppInfo &appInfo);
     void removeApp(QModelIndex index);
+    void clearAppsList();
 
     int getRouteMode();
     void setRouteMode(int routeMode);