Skip to content

Commit 3cd98eb

Browse files
authored
fix: multi-device ringing state (#1457)
1 parent cddf19c commit 3cd98eb

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

demo-app/src/main/kotlin/io/getstream/video/android/CallActivity.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ class CallActivity : ComposeStreamCallActivity() {
8282
@Composable
8383
override fun StreamCallActivity.LoadingContent(call: Call) {
8484
// Use as loading screen.. so the layout is shown.
85-
if (call.type == "default") {
86-
VideoCallContent(call = call)
87-
} else {
88-
FullScreenCircleProgressBar(text = "Connecting...")
89-
}
85+
FullScreenCircleProgressBar(text = "Connecting...")
9086
}
9187

9288
@Composable

demo-app/src/main/kotlin/io/getstream/video/android/util/StreamVideoInitHelper.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ object StreamVideoInitHelper {
217217
return authData.token
218218
}
219219
},
220+
callUpdatesAfterLeave = true,
220221
appName = "Stream Video Demo App",
221222
audioProcessing = NoiseCancellation(context),
222223
callServiceConfigRegistry = CallServiceConfigRegistry(),

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallState.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,11 @@ public class CallState(
10771077
RingingState.Active
10781078
}
10791079
} else {
1080-
RingingState.Idle
1080+
if (_ringingState.value is RingingState.Incoming && !acceptedOnThisDevice) {
1081+
RingingState.TimeoutNoAnswer
1082+
} else {
1083+
RingingState.Idle
1084+
}
10811085
}
10821086

10831087
if (_ringingState.value != state) {

stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/call/ringing/RingingCallContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public fun RingingCallContent(
175175
onAcceptedContent.invoke()
176176
}
177177

178-
else -> {
178+
RingingState.Idle -> {
179179
// Includes Idle
180180
onIdle.invoke()
181181
}

0 commit comments

Comments
 (0)