filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-30 19:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Synchronizing access to map of roomArgs

Browse Source
This commit is contained in:
Maxime NATUREL 2022-06-20 15:49:35 +02:00
parent 9a39354332
commit 785ce03e67
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
View File

@ -100,7 +100,7 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
?.let { result ->
when (result) {
is UpdateLiveLocationShareResult.Success -> {
roomArgsMap[result.beaconEventId] = roomArgs
addRoomArgs(result.beaconEventId, roomArgs)
locationTracker.requestLastKnownLocation()
}
is UpdateLiveLocationShareResult.Failure -> {
@ -132,21 +132,16 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
fun stopSharingLocation(roomId: String) {
Timber.i("### LocationSharingService.stopSharingLocation for $roomId")
synchronized(roomArgsMap) {
val beaconIds = roomArgsMap
.filter { it.value.roomId == roomId }
.map { it.key }
beaconIds.forEach { roomArgsMap.remove(it) }
tryToDestroyMe()
}
removeRoomArgs(roomId)
tryToDestroyMe()
}
@Synchronized
override fun onLocationUpdate(locationData: LocationData) {
Timber.i("### LocationSharingService.onLocationUpdate. Uncertainty: ${locationData.uncertainty}")
// Emit location update to all rooms in which live location sharing is active
roomArgsMap.toMap().forEach { item ->
roomArgsMap.forEach { item ->
sendLiveLocation(item.value.roomId, item.key, locationData)
}
}
@ -173,6 +168,7 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
stopSelf()
}
@Synchronized
private fun tryToDestroyMe() {
if (roomArgsMap.isEmpty()) {
Timber.i("### LocationSharingService. Destroying self, time is up for all rooms")
@ -193,6 +189,19 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
destroyMe()
}
@Synchronized
private fun addRoomArgs(beaconEventId: String, roomArgs: RoomArgs) {
roomArgsMap[beaconEventId] = roomArgs
}
@Synchronized
private fun removeRoomArgs(roomId: String) {
val beaconIds = roomArgsMap
.filter { it.value.roomId == roomId }
.map { it.key }
beaconIds.forEach { roomArgsMap.remove(it) }
}
private fun launchInIO(block: suspend CoroutineScope.(Session) -> Unit) =
activeSessionHolder
.getSafeActiveSession()