Browse Source

servers list changed on update of protocol and also all servers list of searching

Khubaib 10 months ago
parent
commit
e7c221339f

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

@@ -216,6 +216,7 @@ lateinit var vpnConnectionsUtil: VPNConnectionsUtil
                              val lastServer1 = prefHelper.getServerObject()
                          }
                      }
+                     serverListViewModelSplash.setCountryData()
                  }
              }
 
@@ -924,6 +925,8 @@ fun ColumnScope.ShowProtocolDialog(
             }
         }
 
+//        serverListViewModelSplash.setCountryData()
+
 //        Log.d("server_protocol", "Home: $isServerFound ${desiredServer.id} ${desiredServer.server_name} ${desiredServer.ip} ${desiredServer.protocol} ${desiredServer.remoteId}")
 
 
@@ -988,6 +991,7 @@ fun ColumnScope.ShowProtocolDialog(
                     Button(
                         onClick = {
                             Log.d("ServerCallbacks", "Yes")
+                            serverListViewModelSplash.setCountryData()
                             val server = if (isServerFound) desiredServer else prefHelper.getConnectedServer()
                             prefHelper.setServerObject(server)
                             prefHelper.setConnectedServer(server)

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

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

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

@@ -150,10 +150,12 @@ class ServerListViewModel(context: Context): ViewModel() {
     fun setCountryData() {
         val data = preferencesHelper.getServerData()
 
+        serversListGlobal.clear()
+        serversListAllGlobal.clear()
         var filterServersList = ArrayList<Server>()
+        Log.d("test_serverData", "Size = ${serversListGlobal.size} ${serversListAllGlobal.size}")
 
         data.forEachIndexed { index, serverData ->
-//            Log.d("test_serverData", "$index: ${serverData.name} => ${serverData.servers?.size}")
 
             if (data[index].name?.lowercase().toString() == "servers") {
                 data[index].servers?.let {