mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-23 01:45:52 +03:00
Avoid stopping location service twice
This commit is contained in:
parent
353a8a70eb
commit
3b09323ee4
1 changed files with 4 additions and 9 deletions
|
@ -169,21 +169,16 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
|
|||
private fun tryToDestroyMe() {
|
||||
if (roomArgsMap.isEmpty()) {
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
super.onDestroy()
|
||||
Timber.i("### LocationSharingService.onDestroy")
|
||||
destroyMe()
|
||||
jobs.forEach { it.cancel() }
|
||||
jobs.clear()
|
||||
locationTracker.removeCallback(this)
|
||||
}
|
||||
|
||||
private fun addRoomArgs(beaconEventId: String, roomArgs: RoomArgs) {
|
||||
|
|
Loading…
Reference in a new issue