|
@@ -526,22 +526,32 @@ class ServerListViewModel(context: Context): ViewModel() {
|
|
|
it.server_name
|
|
|
}
|
|
|
|
|
|
- serverprotocol.groupBy(Server::country).mapValues { entry ->
|
|
|
- for ((index, value) in distinctBy.withIndex()) {
|
|
|
-// if (entry.key == value.country) {
|
|
|
-//// distinctBy.get(index).totalServers = entry.value.sumBy { it.totalServers }
|
|
|
-// }
|
|
|
-// calculatePingNoDelay(value) {
|
|
|
-// distinctBy.get(index).ping = it
|
|
|
-// }
|
|
|
- }
|
|
|
- }
|
|
|
+// serverprotocol.groupBy(Server::country).mapValues { entry ->
|
|
|
+// for ((index, value) in distinctBy.withIndex()) {
|
|
|
+//// if (entry.key == value.country) {
|
|
|
+////// distinctBy.get(index).totalServers = entry.value.sumBy { it.totalServers }
|
|
|
+//// }
|
|
|
+//// calculatePingNoDelay(value) {
|
|
|
+//// distinctBy.get(index).ping = it
|
|
|
+//// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
val enabledServer = distinctBy.filter {
|
|
|
it.enable == 1
|
|
|
}
|
|
|
|
|
|
- return (enabledServer as ArrayList<Server>)
|
|
|
+ val tempList2 = ArrayList<Server>()
|
|
|
+
|
|
|
+ enabledServer.forEachIndexed { index1, server1 ->
|
|
|
+ calculatePing(server1){
|
|
|
+// Log.d("serverInfo_ping", "In: ${server1.server_name} $it")
|
|
|
+ server1.ping = it
|
|
|
+ }
|
|
|
+ tempList2.add(server1)
|
|
|
+ }
|
|
|
+
|
|
|
+ return (tempList2 as ArrayList<Server>)
|
|
|
}
|
|
|
|
|
|
fun filterServerByConnectionCount(serverlist: ArrayList<Server>): Server {
|