From f81ee1b267148295e40d7fc3453e1bd74f8938c0 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 12 Sep 2023 21:38:36 +0800
Subject: [PATCH 1/3] reconnect to server when changed the protocol and status
 is connected or connnecting

---
 .../ui/qml/Components/HomeContainersListView.qml   | 14 ++++++++++++++
 client/ui/qml/Pages2/PageHome.qml                  |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index f5d27c00..e265574b 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -62,8 +62,22 @@ ListView {
                 onClicked: {
                     if (checked) {
                         isDefault = true
+                        var needReconnected = false
+                        if (menuContent.currentIndex !== index) {
+                            needReconnected = true
+                        }
+
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
+
+
+                        if (needReconnected &&
+                                (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
+                            PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
+                            PageController.goToPageHome()
+                            menu.visible = false
+                            ConnectionController.openConnection()
+                        }
                     } else {
                         ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 01ba3032..b9bc2366 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -210,7 +210,7 @@ PageType {
                         }
 
                         Component.onCompleted: updateContainersModelFilters()
-                        currentIndex: ContainersModel.getDefaultContainer()
+                        currentIndex: ContainersModel.getDefaultContainer() - 1
                     }
                 }
             }

From 9c0f27edb49bbaa5605ca47fc83a54173b8a44a6 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 13 Sep 2023 08:01:14 +0800
Subject: [PATCH 2/3] removed invalid codes

---
 client/ui/qml/Components/HomeContainersListView.qml | 5 +++--
 client/ui/qml/Pages2/PageHome.qml                   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index e265574b..4708128f 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -61,12 +61,13 @@ ListView {
 
                 onClicked: {
                     if (checked) {
-                        isDefault = true
                         var needReconnected = false
-                        if (menuContent.currentIndex !== index) {
+                        if (!isDefault) {
                             needReconnected = true
                         }
 
+                        isDefault = true
+
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index b9bc2366..cedff2cb 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -210,7 +210,7 @@ PageType {
                         }
 
                         Component.onCompleted: updateContainersModelFilters()
-                        currentIndex: ContainersModel.getDefaultContainer() - 1
+                        // currentIndex: ContainersModel.getDefaultContainer() - 1
                     }
                 }
             }

From 3c9b42b9f73db40a652b3fac3e2b84706c5777f5 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 13 Sep 2023 08:44:50 +0800
Subject: [PATCH 3/3] deleted unused code

---
 client/ui/qml/Pages2/PageHome.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index cedff2cb..c5ba89d0 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -210,7 +210,6 @@ PageType {
                         }
 
                         Component.onCompleted: updateContainersModelFilters()
-                        // currentIndex: ContainersModel.getDefaultContainer() - 1
                     }
                 }
             }