Przeglądaj źródła

fixed servers group list addition upon changing of protocol

Khubaib 10 miesięcy temu
rodzic
commit
61d25004c8

BIN
app/release/app-release.apk


+ 1 - 2
app/src/main/java/com/vpn/fastestvpnservice/screens/ServerListScreen.kt

@@ -448,7 +448,7 @@ fun ColumnScope.ShowRecommendedList(
                 } else {
                     recommendedFilterList = recommended
                     recommendedFilterList.sortByDescending {
-                        it.country_sort
+                        it.connection_count
                     }
                 }
             }
@@ -608,7 +608,6 @@ fun ColumnScope.ShowAllLocationsList(
                     val countries = serverListViewModelSplash.liveDataGetServersGlobal.observeAsState().value
                     val groupServers = serverListViewModelSplash.liveDataGroupServers.observeAsState().value
                     var countriesFilter = ArrayList<ServerDataGlobal?>()
-                    var groupServersFilter = ArrayList<ServerDataGlobal?>()
 
                     if (isAlphabetList.value) {
                         countriesFilter = serversListFinalGlobal as ArrayList

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

@@ -164,11 +164,10 @@ class ServerListViewModel(context: Context): ViewModel() {
 
         serversListGlobal.clear()
         serversListAllGlobal.clear()
+        serversGroupListGlobal.clear()
         var filterServersList = ArrayList<Server>()
-        Log.d("test_serverData", "Size = ${serversListGlobal.size} ${serversListAllGlobal.size}")
 
         data.forEachIndexed { index, serverData ->
-
             if (data[index].name?.lowercase().toString() == "servers") {
                 data[index].servers?.let {
                     val servers = serverListViewModelSplash.filterServersByISO(
@@ -177,7 +176,6 @@ class ServerListViewModel(context: Context): ViewModel() {
                     serversListGlobal.add(index, ServerDataGlobal(serverData.name, servers))
 
                     servers.forEachIndexed { index, server ->
-                        Log.d("test_filterList", "${server.server_name} ${server.country}")
                         getServerGroupList(server, it, index)
                     }
 
@@ -194,7 +192,6 @@ class ServerListViewModel(context: Context): ViewModel() {
 
         serversListFinalGlobal = serversListGlobal
         serversListGlobal.forEachIndexed { index, serverData ->
-            Log.d("test_serverData G", "$index: ${serverData?.name} => ${serverData?.servers?.size}")
             serverData?.servers?.let { serversListAllGlobal.addAll(it) }
         }
 
@@ -202,10 +199,6 @@ class ServerListViewModel(context: Context): ViewModel() {
             serverDataGlobal?.servers?.let { serversListAllGlobal.addAll(it) }
         }
 
-//        serversListAllGlobal.forEachIndexed { index, serverData ->
-//            Log.d("test_serverDataAll", "$index: ${serverData.server_name} ${serverData.ping}")
-//        }
-
         _mutableLiveDataGetServersGlobal.value = serversListGlobal
         mutableLiveDataAllServers.value = serversListAllGlobal
     }