Merge branch 'develop'

aleksandar-apostolov · aleksandar-apostolov · commit 78c70999ded1 · 2025-04-02T11:44:43.000+02:00
diff --git a/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt b/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt
@@ -6,11 +6,11 @@ object Configuration {
     const val minSdk = 24
     const val majorVersion = 1
     const val minorVersion = 4
-    const val patchVersion = 4
+    const val patchVersion = 5
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 51
+    const val versionCode = 54
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
-    const val streamVideoCallGooglePlayVersion = "1.4.4"
+    const val streamVideoCallGooglePlayVersion = "1.4.5"
     const val streamWebRtcVersionName = "1.3.6"
 }
diff --git a/metrics/size.json b/metrics/size.json
@@ -1,8 +1,8 @@
 {
   "debug": {
     "stream-video-android-core": 12924,
-    "stream-video-android-ui-xml": 7376,
-    "stream-video-android-ui-compose": 9316
+    "stream-video-android-ui-xml": 7392,
+    "stream-video-android-ui-compose": 9332
   },
   "release": {
     "stream-video-android-core": 11484,
diff --git a/stream-video-android-core/api/stream-video-android-core.api b/stream-video-android-core/api/stream-video-android-core.api
@@ -1203,6 +1203,7 @@ public final class io/getstream/android/video/generated/models/CallSessionEndedE
 
 public final class io/getstream/android/video/generated/models/CallSessionParticipantCountsUpdatedEvent : io/getstream/android/video/generated/models/VideoEvent, io/getstream/android/video/generated/models/WSCallEvent {
 	public fun <init> (ILjava/lang/String;Lorg/threeten/bp/OffsetDateTime;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
+	public synthetic fun <init> (ILjava/lang/String;Lorg/threeten/bp/OffsetDateTime;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()I
 	public final fun component2 ()Ljava/lang/String;
 	public final fun component3 ()Lorg/threeten/bp/OffsetDateTime;
@@ -1848,6 +1849,7 @@ public final class io/getstream/android/video/generated/models/Credentials {
 
 public final class io/getstream/android/video/generated/models/CustomVideoEvent : io/getstream/android/video/generated/models/VideoEvent, io/getstream/android/video/generated/models/WSCallEvent {
 	public fun <init> (Ljava/lang/String;Lorg/threeten/bp/OffsetDateTime;Ljava/util/Map;Lio/getstream/android/video/generated/models/UserResponse;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/threeten/bp/OffsetDateTime;Ljava/util/Map;Lio/getstream/android/video/generated/models/UserResponse;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Lorg/threeten/bp/OffsetDateTime;
 	public final fun component3 ()Ljava/util/Map;
@@ -4974,6 +4976,7 @@ public final class io/getstream/android/video/generated/models/UserFeedbackRepor
 
 public final class io/getstream/android/video/generated/models/UserInfoResponse {
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
 	public final fun component3 ()Ljava/lang/String;
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/CallResponse.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/CallResponse.kt
@@ -69,7 +69,7 @@ data class CallResponse(
     val createdBy: io.getstream.android.video.generated.models.UserResponse,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "egress")
     val egress: io.getstream.android.video.generated.models.EgressResponse,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/CallSessionParticipantCountsUpdatedEvent.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/CallSessionParticipantCountsUpdatedEvent.kt
@@ -44,7 +44,7 @@ data class CallSessionParticipantCountsUpdatedEvent(
     val sessionId: kotlin.String,
 
     @Json(name = "participants_count_by_role")
-    val participantsCountByRole: kotlin.collections.Map<kotlin.String, kotlin.Int>,
+    val participantsCountByRole: kotlin.collections.Map<kotlin.String, kotlin.Int> = emptyMap(),
 
     @Json(name = "type")
     val type: kotlin.String,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/CustomVideoEvent.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/CustomVideoEvent.kt
@@ -38,7 +38,7 @@ data class CustomVideoEvent(
     val createdAt: org.threeten.bp.OffsetDateTime,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "user")
     val user: io.getstream.android.video.generated.models.UserResponse,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/HealthCheckEvent.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/HealthCheckEvent.kt
@@ -38,7 +38,7 @@ data class HealthCheckEvent(
     val createdAt: org.threeten.bp.OffsetDateTime,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "type")
     val type: kotlin.String,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/MemberResponse.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/MemberResponse.kt
@@ -41,7 +41,7 @@ data class MemberResponse(
     val userId: kotlin.String,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "user")
     val user: io.getstream.android.video.generated.models.UserResponse,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/OwnUserResponse.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/OwnUserResponse.kt
@@ -55,7 +55,7 @@ data class OwnUserResponse(
     val teams: kotlin.collections.List<kotlin.String>,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "deactivated_at")
     val deactivatedAt: org.threeten.bp.OffsetDateTime? = null,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserInfoResponse.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserInfoResponse.kt
@@ -45,5 +45,5 @@ data class UserInfoResponse(
     val roles: kotlin.collections.List<kotlin.String>,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 )
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserResponse.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserResponse.kt
@@ -54,7 +54,7 @@ data class UserResponse(
     val teams: kotlin.collections.List<kotlin.String>,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "deactivated_at")
     val deactivatedAt: org.threeten.bp.OffsetDateTime? = null,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserResponsePrivacyFields.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserResponsePrivacyFields.kt
@@ -54,7 +54,7 @@ data class UserResponsePrivacyFields(
     val teams: kotlin.collections.List<kotlin.String>,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "deactivated_at")
     val deactivatedAt: org.threeten.bp.OffsetDateTime? = null,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserUpdatedEvent.kt b/stream-video-android-core/src/main/kotlin/io/getstream/android/video/generated/models/UserUpdatedEvent.kt
@@ -35,7 +35,7 @@ data class UserUpdatedEvent(
     val createdAt: org.threeten.bp.OffsetDateTime,
 
     @Json(name = "custom")
-    val custom: kotlin.collections.Map<kotlin.String, Any?>,
+    val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),
 
     @Json(name = "user")
     val user: io.getstream.android.video.generated.models.UserResponsePrivacyFields,
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallState.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallState.kt
@@ -128,9 +128,7 @@ import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.threeten.bp.Clock
-import org.threeten.bp.Instant
 import org.threeten.bp.OffsetDateTime
-import org.threeten.bp.ZoneOffset
 import stream.video.sfu.models.Participant
 import stream.video.sfu.models.TrackType
 import java.text.SimpleDateFormat
@@ -597,7 +595,8 @@ public class CallState(
      * Holds the current list of closed captions. This list is updated dynamically
      * and contains at most [ClosedCaptionsSettings.maxVisibleCaptions] captions.
      */
-    public val closedCaptions: StateFlow<List<CallClosedCaption>> = closedCaptionManager.closedCaptions
+    public val closedCaptions: StateFlow<List<CallClosedCaption>> =
+        closedCaptionManager.closedCaptions
 
     /**
      *  Holds the current closed caption mode for the video call. This object contains information about closed
@@ -662,7 +661,6 @@ public class CallState(
                 val new = _rejectedBy.value.toMutableSet()
                 new.add(event.user.id)
                 _rejectedBy.value = new.toSet()
-
                 updateRingingState(
                     rejectReason = event.reason?.let {
                         when (it) {
@@ -909,11 +907,12 @@ public class CallState(
                 event.call.session?.let { session ->
                     _session.value = session
                 }
+                updateFromResponse(event.call)
             }
 
             is CallSessionEndedEvent -> {
-                updateFromResponse(event.call)
                 _session.value = event.call.session
+                updateFromResponse(event.call)
             }
 
             is CallSessionParticipantCountsUpdatedEvent -> {
@@ -982,9 +981,11 @@ public class CallState(
             is CallTranscriptionStartedEvent -> {
                 _transcribing.value = true
             }
+
             is CallTranscriptionStoppedEvent -> {
                 _transcribing.value = false
             }
+
             is CallTranscriptionFailedEvent -> {
                 _transcribing.value = false
             }
@@ -1102,23 +1103,17 @@ public class CallState(
     private fun updateFromJoinResponse(event: JoinCallResponseEvent) {
         // update the participant count
         _participantCounts.value = event.participantCount
-
-        val startedAt = event.callState.started_at
-        if (startedAt != null) {
-            val instant = Instant.ofEpochSecond(startedAt.epochSecond, 0)
-            _startedAt.value = OffsetDateTime.ofInstant(instant, ZoneOffset.UTC)
-        } else {
-            _startedAt.value = null
-        }
-
         // creates the participants
         val participantStates = event.callState.participants.map {
             getOrCreateParticipant(it)
         }
         upsertParticipants(participantStates)
     }
 
-    private fun updateParticipantCounts(session: CallSessionResponse? = null, sfuHealthCheckEvent: SFUHealthCheckEvent? = null) {
+    private fun updateParticipantCounts(
+        session: CallSessionResponse? = null,
+        sfuHealthCheckEvent: SFUHealthCheckEvent? = null,
+    ) {
         // When in JOINED state, we should use the participant from SFU health check event, as it's more accurate.
 
         if (sfuHealthCheckEvent != null) {
@@ -1281,11 +1276,31 @@ public class CallState(
         _settings.value = response.settings
         _transcribing.value = response.transcribing
         _team.value = response.team
+        didUpdateSession(response.session)
 
         updateRingingState()
         closedCaptionManager.handleCallUpdate(response)
     }
 
+    /**
+     * Called after session changes
+     */
+    private fun didUpdateSession(newSession: CallSessionResponse?) {
+        _session.value = newSession
+
+        if (newSession?.startedAt != null) {
+            _startedAt.value = newSession.startedAt
+        } else if (newSession?.liveStartedAt != null) {
+            _startedAt.value = newSession.liveStartedAt
+        }
+
+        if (newSession?.liveEndedAt != null) {
+            _endedAt.value = newSession.liveEndedAt
+        }
+        // Also unify participant counts if needed:
+        updateParticipantCounts(session = newSession)
+    }
+
     fun updateFromResponse(response: GetOrCreateCallResponse) {
         val members = response.members
         updateFromResponse(members)

Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,5 @@ data class UserInfoResponse(`
`45`	`45`	`val roles: kotlin.collections.List<kotlin.String>,`
`46`	`46`
`47`	`47`	`@Json(name = "custom")`
`48`		`- val custom: kotlin.collections.Map<kotlin.String, Any?>,`
	`48`	`+ val custom: kotlin.collections.Map<kotlin.String, Any?> = emptyMap(),`
`49`	`49`	`)`