rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid stopping location service twice

Browse Source
This commit is contained in:
Maxime NATUREL 2022-06-27 15:10:54 +02:00
parent 353a8a70eb
commit 3b09323ee4
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,21 +169,16 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
private fun tryToDestroyMe() { private fun tryToDestroyMe() {
if (roomArgsMap.isEmpty()) { if (roomArgsMap.isEmpty()) {
Timber.i("### LocationSharingService. Destroying self, time is up for all rooms") Timber.i("### LocationSharingService. Destroying self, time is up for all rooms")
destroyMe()
}
}
private fun destroyMe() {
jobs.forEach { it.cancel() }
jobs.clear()
locationTracker.removeCallback(this)
stopSelf() stopSelf()
} }
}
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
Timber.i("### LocationSharingService.onDestroy") Timber.i("### LocationSharingService.onDestroy")
destroyMe() jobs.forEach { it.cancel() }
jobs.clear()
locationTracker.removeCallback(this)
} }
private fun addRoomArgs(beaconEventId: String, roomArgs: RoomArgs) { private fun addRoomArgs(beaconEventId: String, roomArgs: RoomArgs) {