PIA-1187: Make regions result map synchronized

pia-foss · Jan 12, 2024 · b32d46d · b32d46d
1 parent 937a44e
commit b32d46d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/regions/src/androidMain/kotlin/com/privateinternetaccess/regions/internals/PingPerformer.kt b/regions/src/androidMain/kotlin/com/privateinternetaccess/regions/internals/PingPerformer.kt
@@ -44,7 +44,8 @@ internal actual class PingPerformer : CoroutineScope {
         callback: (result: Map<String, List<Pair<String, Long>>>) -> Unit
     ) {
         async {
-            val result = mutableMapOf<String, List<Pair<String, Long>>>()
+            val syncResult =
+                Collections.synchronizedMap(mutableMapOf<String, List<Pair<String, Long>>>())
             val requests: MutableList<Job> = mutableListOf()
             for ((region, endpointsInRegion) in endpoints) {
                 val syncRegionEndpointsResults =
@@ -59,12 +60,12 @@ internal actual class PingPerformer : CoroutineScope {
                             REGIONS_PING_TIMEOUT.toLong()
                         } ?: latency
                         syncRegionEndpointsResults.add(Pair(it, latency))
-                        result[region] = syncRegionEndpointsResults
+                        syncResult[region] = syncRegionEndpointsResults
                     })
                 }
             }
             requests.joinAll()
-            launch(Dispatchers.Main) { callback(result) }
+            launch(Dispatchers.Main) { callback(syncResult) }
         }
     }