Merge branch 'feature/split-tunnel-mobile' of github.com:amnezia-vpn/amnezia-client into feature/split-tunnel-mobile

client/ui/models/containers_model.cpp

@@ -117,8 +117,9 @@ QString ContainersModel::getDefaultContainerName()
     return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
 }
 
-void ContainersModel::setDefaultContainer(DockerContainer container)
+void ContainersModel::setDefaultContainer(int index)
 {
+    auto container = static_cast<DockerContainer>(index);
     m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
     m_defaultContainerIndex = container;
     emit defaultContainerChanged();

client/ui/models/containers_model.h

@@ -46,7 +46,7 @@ public:
 public slots:
     DockerContainer getDefaultContainer();
     QString getDefaultContainerName();
-    void setDefaultContainer(DockerContainer container);
+    void setDefaultContainer(int index);
 
     void setCurrentlyProcessedServerIndex(const int index);
 

client/ui/models/sites_model.cpp

@@ -8,6 +8,7 @@ SitesModel::SitesModel(std::shared_ptr<Settings> settings, QObject *parent)
         m_isSplitTunnelingEnabled = false;
         m_currentRouteMode = Settings::RouteMode::VpnOnlyForwardSites;
     } else {
+        m_isSplitTunnelingEnabled = true;
         m_currentRouteMode = routeMode;
     }
     fillSites();

client/ui/qml/Pages2/PageSetupWizardInstalling.qml

@@ -25,7 +25,7 @@ PageType {
 
         function onInstallContainerFinished(finishedMessage, isServiceInstall) {
             if (!ConnectionController.isConnected && !isServiceInstall) {
-                ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex)
+                ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex())
             }
 
             PageController.goToStartPage()