Merge pull request #496 from amnezia-vpn/dev

Release 4.2.0.1

client/ui/models/servers_model.cpp

@@ -15,10 +15,6 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
         auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
         emit ServersModel::defaultContainerChanged(defaultContainer);
     });
-    connect(this, &ServersModel::currentlyProcessedServerIndexChanged, this, [this](const int serverIndex) {
-        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
-        emit ServersModel::defaultContainerChanged(defaultContainer);
-    });
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -273,7 +269,6 @@ void ServersModel::removeServer()
     if (m_settings->serversCount() == 0) {
         setDefaultServerIndex(-1);
     }
-    setCurrentlyProcessedServerIndex(m_defaultServerIndex);
     endResetModel();
 }
 

client/ui/qml/Components/HomeContainersListView.qml

@@ -26,22 +26,6 @@ ListView {
         id: containersRadioButtonGroup
     }
 
-    Connections {
-        target: ServersModel
-
-        function onCurrentlyProcessedServerIndexChanged() {
-            menuContent.checkCurrentItem()
-        }
-    }
-
-    function checkCurrentItem() {
-        var item = menuContent.itemAtIndex(currentIndex)
-        if (item !== null) {
-            var radioButton = item.children[0].children[0]
-            radioButton.checked = true
-        }
-    }
-
     delegate: Item {
         implicitWidth: rootWidth
         implicitHeight: content.implicitHeight

client/ui/qml/Pages2/PageHome.qml

@@ -31,7 +31,6 @@ PageType {
                 containersDropDown.rootButtonClickedFunction()
             }
         }
-
         function onForceCloseDrawer() {
             buttonContent.state = "collapsed"
         }

client/ui/qml/Pages2/PageSetupWizardInstalling.qml

@@ -42,7 +42,6 @@ PageType {
         function onInstallServerFinished(finishedMessage) {
             if (!ConnectionController.isConnected) {
                 ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
-                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             }
 
             PageController.goToStartPage()

client/ui/qml/Pages2/PageSetupWizardViewConfig.qml

@@ -26,7 +26,6 @@ PageType {
         function onImportFinished() {
             if (!ConnectionController.isConnected) {
                 ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
-                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             }
 
             PageController.goToStartPage()

client/vpnconnection.cpp

@@ -65,7 +65,6 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
             IpcClient::Interface()->flushDns();
 
             if (m_settings->routeMode() != Settings::VpnAllSites) {
-                qDebug() << "1";
                 IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
                 // qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
             }
@@ -75,11 +74,9 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
             IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << dns1 << dns2);
 
             if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
-                qDebug() << "2";
                 QTimer::singleShot(1000, m_vpnProtocol.data(),
                                    [this]() { addSitesRoutes(m_vpnProtocol->vpnGateway(), m_settings->routeMode()); });
             } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-                qDebug() << "3";
                 IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0/1");
                 IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "128.0.0.0/1");