Merge branch 'develop' into valere/call/fix_join_button_on_several_items

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationShare.kt

@@ -15,10 +15,19 @@ import io.element.android.libraries.matrix.api.core.UserId
 data class LiveLocationShare(
     /** The user who is sharing their location. */
     val userId: UserId,
-    /** The last known geo URI (e.g., "geo:51.5074,-0.1278"). */
-    val lastGeoUri: String,
-    /** The timestamp of the last location update. */
-    val lastTimestamp: Long,
-    /** Whether the live location share is still active. */
-    val isLive: Boolean,
+    /** The last known location if any. */
+    val lastLocation: LastLocation?,
+    /** The timestamp when location sharing started, in milliseconds.*/
+    val startTimestamp: Long,
+    /** The timestamp when location sharing ends, in milliseconds. */
+    val endTimestamp: Long,
+)
+
+data class LastLocation(
+    /** The last known geo URI (e.g., "geo:51.5074,-0.1278"). */
+    val geoUri: String,
+    /** The timestamp of the last location update. */
+    val timestamp: Long,
+    /** The asset of the last location update. */
+    val assetType: AssetType,
 )

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt

@@ -106,13 +106,15 @@ data class FailedToParseStateContent(
 ) : EventContent
 
 data class LiveLocationContent(
-    val body: String,
     val isLive: Boolean,
     val description: String?,
+    val startTimestamp: Long,
     val timeout: Long,
     val assetType: AssetType?,
     val locations: List<LiveLocationInfo>,
-) : EventContent
+) : EventContent {
+    val endTimestamp = startTimestamp + timeout
+}
 
 data object LegacyCallInviteContent : EventContent