Fix API breaks and an issue with the location changing not moving the camera

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.location.impl.common.MapDefaults
+import kotlinx.coroutines.flow.SharingStarted
 import org.maplibre.compose.camera.CameraState
 import org.maplibre.compose.location.DesiredAccuracy
 import org.maplibre.compose.location.LocationPuck
@@ -23,6 +24,9 @@ import org.maplibre.compose.location.UserLocationState
 import org.maplibre.compose.location.rememberAndroidLocationProvider
 import org.maplibre.compose.location.rememberNullLocationProvider
 import org.maplibre.compose.location.rememberUserLocationState
+import org.maplibre.spatialk.units.Bearing
+import org.maplibre.spatialk.units.extensions.inDegrees
+import org.maplibre.spatialk.units.extensions.meters
 import kotlin.time.Duration.Companion.seconds
 
 @Composable
@@ -31,22 +35,28 @@ fun UserLocationPuck(
     locationState: UserLocationState,
     trackUserLocation: Boolean,
 ) {
-    LocationTrackingEffect(
-        locationState = locationState,
-        enabled = trackUserLocation,
-    ) {
-        val finalPosition = cameraState.position.copy(
-            target = currentLocation.position,
-            bearing = currentLocation.bearing ?: cameraState.position.bearing,
-            zoom = cameraState.position.zoom.coerceAtLeast(MapDefaults.DEFAULT_ZOOM)
-        )
-        cameraState.animateTo(finalPosition)
-    }
     val location = locationState.location
     if (location != null) {
+        // Moved inside this block so it correctly tracks the updated locationState value
+        LocationTrackingEffect(
+            locationState = locationState,
+            enabled = trackUserLocation,
+        ) {
+            val newTarget = currentLocation.location?.position?.value
+            val newBearing = currentLocation.orientation?.orientation?.value?.clockwiseRotationTo(Bearing.North)?.inDegrees
+            if (newTarget != null || newBearing != null) {
+                val finalPosition = cameraState.position.copy(
+                    target = newTarget ?: cameraState.position.target,
+                    bearing = newBearing ?: cameraState.position.bearing,
+                    zoom = cameraState.position.zoom.coerceAtLeast(MapDefaults.DEFAULT_ZOOM)
+                )
+                cameraState.animateTo(finalPosition)
+            }
+        }
+
         LocationPuck(
             idPrefix = "user-location",
-            locationState = locationState,
+            location = locationState.location,
             cameraState = cameraState,
             accuracyThreshold = Float.POSITIVE_INFINITY,
             showBearingAccuracy = false,
@@ -74,7 +84,8 @@ fun rememberUserLocationState(hasLocationPermission: Boolean): UserLocationState
         rememberAndroidLocationProvider(
             updateInterval = 5.seconds,
             desiredAccuracy = DesiredAccuracy.High,
-            minDistanceMeters = 5f,
+            minDistance = 5.meters,
+            sharingStarted = SharingStarted.Eagerly,
         )
     }
     return rememberUserLocationState(locationProvider)

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingService.kt

@@ -36,6 +36,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import org.maplibre.compose.location.AndroidLocationProvider
 import org.maplibre.compose.location.DesiredAccuracy
+import org.maplibre.spatialk.units.extensions.inMeters
+import org.maplibre.spatialk.units.extensions.meters
 import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 import io.element.android.features.location.api.Location as ApiLocation
@@ -91,7 +93,7 @@ class LiveLocationSharingService : Service() {
                 val locationProvider = AndroidLocationProvider(
                     context = applicationContext,
                     updateInterval = UPDATE_INTERVAL_IN_SECOND.seconds,
-                    minDistanceMeters = minDistanceMeters.toFloat(),
+                    minDistance = minDistanceMeters.meters,
                     desiredAccuracy = DesiredAccuracy.Balanced,
                     coroutineScope = coroutineScope
                 )
@@ -100,9 +102,9 @@ class LiveLocationSharingService : Service() {
             .filterNotNull()
             .map { location ->
                 ApiLocation(
-                    lat = location.position.latitude,
+                    lat = location.position.value.latitude,
-                    lon = location.position.longitude,
+                    lon = location.position.value.longitude,
-                    accuracy = location.accuracy.toFloat(),
+                    accuracy = location.position.accuracy?.inMeters?.toFloat() ?: 0f,
                 )
             }
             .onEach(coordinator::dispatch)

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenter.kt

@@ -94,8 +94,8 @@ class ShareLocationPresenter(
         fun checkLocationConstraints() {
             // No need to check SendLiveLocationPermissions here
             val locationConstraints = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
-            dialogState = ShareLocationState.Dialog.Constraints(locationConstraints.toDialogState())
             trackUserPosition = locationConstraints is LocationConstraintsCheck.Success
+            dialogState = ShareLocationState.Dialog.Constraints(locationConstraints.toDialogState())
         }
 
         suspend fun computeLiveLocationDialogState(): ShareLocationState.Dialog {

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt

@@ -222,8 +222,8 @@ private fun BottomSheetContent(
             state.eventSink(
                 ShareLocationEvent.ShareStaticLocation(
                     location = Location(
-                        lat = userLocation.position.latitude,
+                        lat = userLocation.position.value.latitude,
-                        lon = userLocation.position.longitude
+                        lon = userLocation.position.value.longitude
                     ),
                     isPinned = false
                 )