showing dialog for server switching...

app/src/main/java/com/vpn/fastestvpnservice/customItems/CountryItem.kt

@@ -76,6 +76,8 @@ import com.vpn.fastestvpnservice.viewmodels.SplashViewModel
 import java.lang.Exception
 import java.util.logging.Handler
 
+var serverInfoObj: MutableState<Server> = mutableStateOf(Server())
+
 @Composable
 fun CountryItem(server: Server, category: String, countryTotalServers: Int, navHostController: NavHostController) {
     Log.d("test_countrySize", "CountryItem Called ${server.server_name} ${server.totalServers}")
@@ -106,7 +108,7 @@ fun CountryItem(server: Server, category: String, countryTotalServers: Int, navH
             Log.d("ServerCallbacks", "isServerClicked $isCountryServerClicked")
             onServer.onServerSelected(context, homeViewModel,
                 onClick =  { isCountryServerClicked = false },
-                false,
+                true,
                 server
             )
             navHostController.popBackStack()
@@ -118,7 +120,7 @@ fun CountryItem(server: Server, category: String, countryTotalServers: Int, navH
                 context,
                 homeViewModel,
                 onClick =  { isServerServerClicked = false },
-                false,
+                true,
                 server
             )
             navHostController.popBackStack()
@@ -146,7 +148,7 @@ fun CountryItem(server: Server, category: String, countryTotalServers: Int, navH
                             interactionSource = remember { MutableInteractionSource() }
                         ) {
                             if (server.enable == 1) {
-                                basePreferenceHelper.setServerObject(server)
+//                                basePreferenceHelper.setServerObject(server)
                                 isCountryServerClicked = true
                             } else {
                                 navHostController.navigate(
@@ -374,8 +376,8 @@ fun ColumnScope.ExpandableRow(server: ArrayList<Server>, navHostController: NavH
                             context,
                             homeViewModel,
                             onClick = {isExpServerClicked = false},
-                            false,
-                            serverInfo
+                            true,
+                            serverInfoObj.value
                         )
                         navHostController.popBackStack()
                     }
@@ -394,7 +396,8 @@ fun ColumnScope.ExpandableRow(server: ArrayList<Server>, navHostController: NavH
                                 interactionSource = remember { MutableInteractionSource() }
                             ) {
                                 if (serverInfo.enable == 1) {
-                                    basePreferenceHelper.setServerObject(serverInfo)
+                                    serverInfoObj.value = serverInfo
+//                                    basePreferenceHelper.setServerObject(serverInfo)
                                     isExpServerClicked = true
                                 } else {
                                     navHostController.navigate(

app/src/main/java/com/vpn/fastestvpnservice/customItems/ServerItem.kt

@@ -109,7 +109,7 @@ fun ServerItem(server: Server, navHostController: NavHostController, serverPing:
                 context,
                 homeViewModel,
                 onClick = { isServerClicked = false },
-                false,
+                true,
                 server
             )
 
@@ -127,7 +127,7 @@ fun ServerItem(server: Server, navHostController: NavHostController, serverPing:
                     interactionSource = remember { MutableInteractionSource() }
                 ) {
                     if (server.enable == 1) {
-                        basePreferenceHelper.setServerObject(server)
+//                        basePreferenceHelper.setServerObject(server)
                         isServerClicked = true
                     } else {
                         navHostController.navigate(
@@ -402,7 +402,7 @@ fun ServerSearchItem(
             context,
             homeViewModel,
             onClick = { isSearchServerClicked = false },
-            false,
+            true,
             server
         )
         navHostController.popBackStack()
@@ -425,7 +425,7 @@ fun ServerSearchItem(
                     interactionSource = remember { MutableInteractionSource() }
                 ) {
                     if (server.enable == 1) {
-                        basePreferenceHelper.setServerObject(server)
+//                        basePreferenceHelper.setServerObject(server)
                         isSearchServerClicked = isServerCallbackShown
 
                         if (!isServerCallbackShown) {

app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HomeScreen.kt

@@ -145,7 +145,10 @@ lateinit var homeViewModel1: HomeViewModel
 
         val lastServer = basePreferenceHelper.getServerObject()
         if (isServerDialogShown) {
+            Log.d("ServerCallbacks", "onServerSelected true!")
             if (wg.isVPNConnected()) {
+                Log.d("ServerCallbacks", "onServerSelected isVPNConnected!")
+                Log.d("ServerCallbacks", "onServerSelected ${lastServer?.id} ${server?.id}")
                 if (lastServer?.id != server.id) {
                     isServerDialog.value = true
                     serverObj.value = server