diff --git a/service/src/main/kotlin/org/microg/nlp/service/GeocodeFuser.kt b/service/src/main/kotlin/org/microg/nlp/service/GeocodeFuser.kt index 14f25f4..0568ade 100644 --- a/service/src/main/kotlin/org/microg/nlp/service/GeocodeFuser.kt +++ b/service/src/main/kotlin/org/microg/nlp/service/GeocodeFuser.kt @@ -11,9 +11,10 @@ import android.location.Address import kotlinx.coroutines.launch import org.microg.nlp.api.Constants.ACTION_GEOCODER_BACKEND import java.util.ArrayList +import java.util.concurrent.CopyOnWriteArrayList class GeocodeFuser(private val context: Context, private val root: UnifiedLocationServiceRoot) { - private val backendHelpers = ArrayList() + private val backendHelpers = CopyOnWriteArrayList() suspend fun reset() { unbind() diff --git a/service/src/main/kotlin/org/microg/nlp/service/LocationFuser.kt b/service/src/main/kotlin/org/microg/nlp/service/LocationFuser.kt index 84b42be..b5add73 100644 --- a/service/src/main/kotlin/org/microg/nlp/service/LocationFuser.kt +++ b/service/src/main/kotlin/org/microg/nlp/service/LocationFuser.kt @@ -19,10 +19,11 @@ import java.util.Comparator import org.microg.nlp.api.Constants.ACTION_LOCATION_BACKEND import org.microg.nlp.api.Constants.LOCATION_EXTRA_OTHER_BACKENDS +import java.util.concurrent.CopyOnWriteArrayList class LocationFuser(private val context: Context, private val root: UnifiedLocationServiceRoot) { - private val backendHelpers = ArrayList() + private val backendHelpers = CopyOnWriteArrayList() private var fusing = false private var lastLocationReportTime: Long = 0