filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support sharing live location in multiple rooms.

Browse Source
This commit is contained in:
Onuray Sahin 2022-03-22 16:01:51 +03:00
parent 7e5c293ebc
commit 70c8a8bf34
5 changed files with 75 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
View File

@ -23,5 +23,5 @@ sealed class LocationSharingAction : VectorViewModelAction {
data class PinnedLocationSharing(val locationData: LocationData?) : LocationSharingAction()
data class LocationTargetChange(val locationData: LocationData) : LocationSharingAction()
object ZoomToUserLocation : LocationSharingAction()
object StartLiveLocationSharing : LocationSharingAction()
data class StartLiveLocationSharing(val duration: Long) : LocationSharingAction()
}

8
vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
View File

@ -183,8 +183,8 @@ class LocationSharingFragment @Inject constructor(
private fun handleStartLiveLocationService(event: LocationSharingViewEvents.StartLiveLocationService) {
Intent(requireContext(), LocationSharingService::class.java)
.apply {
putExtra(LocationSharingService.EXTRA_SESSION_ID, event.sessionId)
putExtra(LocationSharingService.EXTRA_ROOM_ID, event.roomId)
putExtra(LocationSharingService.EXTRA_ROOM_ARGS,
LocationSharingService.RoomArgs(event.sessionId, event.roomId, event.duration))
}
.also {
ContextCompat.startForegroundService(requireContext(), it)
@ -236,7 +236,9 @@ class LocationSharingFragment @Inject constructor(
}
private fun startLiveLocationSharing() {
viewModel.handle(LocationSharingAction.StartLiveLocationSharing)
// TODO. Get duration from user
val duration = 30 * 1000L
viewModel.handle(LocationSharingAction.StartLiveLocationSharing(duration))
}
private fun updateMap(state: LocationSharingViewState) {

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

@ -18,44 +18,87 @@ package im.vector.app.features.location
import android.content.Intent
import android.os.IBinder
import android.os.Parcelable
import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.core.services.VectorService
import im.vector.app.features.notifications.NotificationUtils
import kotlinx.parcelize.Parcelize
import timber.log.Timber
import java.util.Timer
import java.util.TimerTask
import javax.inject.Inject
@AndroidEntryPoint
class LocationSharingService : VectorService(), LocationTracker.Callback {
@Parcelize
data class RoomArgs(
val sessionId: String,
val roomId: String,
val durationMillis: Long
) : Parcelable
@Inject lateinit var notificationUtils: NotificationUtils
@Inject lateinit var locationTracker: LocationTracker
private var sessionId: String? = null
private var roomId: String? = null
private var roomArgsList = mutableListOf<RoomArgs>()
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
sessionId = intent?.getStringExtra(EXTRA_SESSION_ID)
roomId = intent?.getStringExtra(EXTRA_ROOM_ID)
if (sessionId == null || roomId == null) {
stopForeground(true)
stopSelf()
}
// Show a sticky notification
val notification = notificationUtils.buildLiveLocationSharingNotification()
startForeground(roomId!!.hashCode(), notification)
override fun onCreate() {
super.onCreate()
Timber.d("### LocationSharingService.onCreate")
// Start tracking location
locationTracker.addCallback(this)
locationTracker.start()
}
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val roomArgs = intent?.getParcelableExtra(EXTRA_ROOM_ARGS) as? RoomArgs
Timber.d("### LocationSharingService.onStartCommand. sessionId - roomId ${roomArgs?.sessionId} - ${roomArgs?.roomId}")
if (roomArgs != null) {
roomArgsList.add(roomArgs)
// Show a sticky notification
val notification = notificationUtils.buildLiveLocationSharingNotification()
startForeground(roomArgs.roomId.hashCode(), notification)
// Schedule a timer to stop sharing
scheduleTimer(roomArgs.roomId, roomArgs.durationMillis)
}
return START_STICKY
}
private fun scheduleTimer(roomId: String, durationMillis: Long) {
Timer().schedule(object : TimerTask() {
override fun run() {
stopSharingLocation(roomId)
}
}, durationMillis)
}
private fun stopSharingLocation(roomId: String) {
Timber.d("### LocationSharingService.stopSharingLocation for $roomId")
synchronized(roomArgsList) {
roomArgsList.removeAll { it.roomId == roomId }
if (roomArgsList.isEmpty()) {
Timber.d("### LocationSharingService. Destroying self, time is up for all rooms")
destroyMe()
}
}
}
private fun destroyMe() {
locationTracker.removeCallback(this)
stopSelf()
}
override fun onDestroy() {
super.onDestroy()
locationTracker.removeCallback(this)
Timber.d("### LocationSharingService.onDestroy")
destroyMe()
}
override fun onBind(intent: Intent?): IBinder? {
@ -63,12 +106,11 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
}
companion object {
const val EXTRA_SESSION_ID = "EXTRA_SESSION_ID"
const val EXTRA_ROOM_ID = "EXTRA_ROOM_ID"
const val EXTRA_ROOM_ARGS = "EXTRA_ROOM_ARGS"
}
override fun onLocationUpdate(locationData: LocationData) {
Timber.d("### LocationSharingService.onLocationUpdate: ${locationData.latitude} - ${locationData.longitude}")
Timber.d("### LocationSharingService.onLocationUpdate. Lat - lon: ${locationData.latitude} - ${locationData.longitude}")
}
override fun onLocationProviderIsNotAvailable() {

2
vector/src/main/java/im/vector/app/features/location/LocationSharingViewEvents.kt
View File

@ -22,5 +22,5 @@ sealed class LocationSharingViewEvents : VectorViewEvents {
object Close : LocationSharingViewEvents()
object LocationNotAvailableError : LocationSharingViewEvents()
data class ZoomToUserLocation(val userLocation: LocationData) : LocationSharingViewEvents()
data class StartLiveLocationService(val sessionId: String, val roomId: String) : LocationSharingViewEvents()
data class StartLiveLocationService(val sessionId: String, val roomId: String, val duration: Long) : LocationSharingViewEvents()
}

15
vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
View File

@ -118,11 +118,11 @@ class LocationSharingViewModel @AssistedInject constructor(
override fun handle(action: LocationSharingAction) {
when (action) {
LocationSharingAction.CurrentUserLocationSharing -> handleCurrentUserLocationSharingAction()
is LocationSharingAction.PinnedLocationSharing -> handlePinnedLocationSharingAction(action)
is LocationSharingAction.LocationTargetChange -> handleLocationTargetChangeAction(action)
LocationSharingAction.ZoomToUserLocation -> handleZoomToUserLocationAction()
LocationSharingAction.StartLiveLocationSharing -> handleStartLiveLocationSharingAction()
LocationSharingAction.CurrentUserLocationSharing -> handleCurrentUserLocationSharingAction()
is LocationSharingAction.PinnedLocationSharing -> handlePinnedLocationSharingAction(action)
is LocationSharingAction.LocationTargetChange -> handleLocationTargetChangeAction(action)
LocationSharingAction.ZoomToUserLocation -> handleZoomToUserLocationAction()
is LocationSharingAction.StartLiveLocationSharing -> handleStartLiveLocationSharingAction(action.duration)
}.exhaustive
}
@ -160,10 +160,11 @@ class LocationSharingViewModel @AssistedInject constructor(
}
}
private fun handleStartLiveLocationSharingAction() {
private fun handleStartLiveLocationSharingAction(duration: Long) {
_viewEvents.post(LocationSharingViewEvents.StartLiveLocationService(
sessionId = session.sessionId,
roomId = room.roomId
roomId = room.roomId,
duration = duration
))
}