Quellcode durchsuchen

server switching from protocol when connected working fine

Khubaib vor 10 Monaten
Ursprung
Commit
da755570a2

+ 1 - 3
app/src/main/java/com/vpn/fastestvpnservice/screens/SplashScreen.kt

@@ -127,9 +127,7 @@ fun Splash(navHostController: NavHostController) {
             modifier = Modifier
                 .align(Alignment.BottomCenter)
                 .padding(50.dp),
-        ){
-
-        }
+        ){}
 
     }
 

+ 2 - 0
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HomeScreen.kt

@@ -206,6 +206,7 @@ lateinit var vpnConnectionsUtil: VPNConnectionsUtil
 
                      val lastServer = prefHelper.getConnectedServer()
                      val serverList = prefHelper.getServerData()
+//                     val serverList = serverListViewModelSplash.liveDataGetServersGlobal.value
 
                      if (lastServer != null) {
                          val serverProtocol = serverListViewModel.getFilteredServerByProtocolChanged(serverList, lastServer, protocol)
@@ -909,6 +910,7 @@ fun ColumnScope.ShowProtocolDialog(
         val newProtocolTitle = if (protocolObj.value.index == 0) AppEnum.AUTO_PROTOCOL.key else protocolObj.value.title
 
         val serverList = prefHelper.getServerData()
+//        val serverList = serverListViewModelSplash.liveDataGetServersGlobal.value
         var desiredServer = Server()
         var isServerFound: Boolean = false
 

+ 2 - 1
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/SearchListViewModel.kt

@@ -106,7 +106,8 @@ class SearchListViewModel constructor(
         }
 
         val allServers2 = serverListViewModelSplash.liveDataAllServers.value
-        val searchServersList = allServers2?.let { serverListViewModelSplash.filterServersAllCategory(it) }
+        Log.d("test_serversall_p", "allServers2 = ${allServers2?.size}")
+        val searchServersList = allServers?.let { serverListViewModelSplash.filterServersAllCategory(it) }
 
         searchServersList?.forEachIndexed { index, server ->
             if (server?.country?.lowercase()?.contains(text.lowercase().toString()) == true

+ 11 - 3
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/ServerListViewModel.kt

@@ -183,6 +183,10 @@ class ServerListViewModel(context: Context): ViewModel() {
             serverData?.servers?.let { serversListAllGlobal.addAll(it) }
         }
 
+        serversGroupListGlobal.forEachIndexed { index, serverDataGlobal ->
+            serverDataGlobal?.servers?.let { serversListAllGlobal.addAll(it) }
+        }
+
 //        serversListAllGlobal.forEachIndexed { index, serverData ->
 //            Log.d("test_serverDataAll", "$index: ${serverData.server_name} ${serverData.ping}")
 //        }
@@ -325,7 +329,7 @@ class ServerListViewModel(context: Context): ViewModel() {
         }
 
 //        val data2 = ArrayList<Server>()
-
+//
 //        data.forEachIndexed { index, server ->
 //            calculatePing(server) {
 //                Log.d("serverInfo_ping", "All: ${server.server_name} $it")
@@ -546,8 +550,8 @@ class ServerListViewModel(context: Context): ViewModel() {
         var isServerFound: Boolean = false
 
         serverList.let {
-            it.forEach {
-                it.servers?.forEach { server ->
+            it?.forEach {
+                it?.servers?.forEach { server ->
                     tempList.add(server)
                 }
             }
@@ -555,12 +559,16 @@ class ServerListViewModel(context: Context): ViewModel() {
 
         for (i in tempList.indices) {
             val obj = tempList[i]
+            Log.d("test_ServerProtocol", "${obj.server_name} ${obj.protocol}")
             if (obj.server_name == serverObj.server_name && protocol.title.equals(obj.protocol, ignoreCase = true)) {
                 server = obj
                 isServerFound = true
             }
         }
 
+        Log.d("test_ServerProtocol", "is? ${server.server_name} $isServerFound")
+
+
         return ServerProtocol(server, isServerFound)
     }