Improve the behaviour when rejecting a call while already in an active call

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

@@ -37,7 +37,6 @@ import io.getstream.video.android.datastore.delegate.StreamUserDataStore
 import io.getstream.video.android.ui.call.CallScreen
 import io.getstream.video.android.ui.common.StreamActivityUiDelegate
 import io.getstream.video.android.ui.common.StreamCallActivity
-import io.getstream.video.android.ui.common.StreamCallActivityConfiguration
 import io.getstream.video.android.ui.common.util.StreamCallActivityDelicateApi
 import io.getstream.video.android.util.FullScreenCircleProgressBar
 import io.getstream.video.android.util.StreamVideoInitHelper
@@ -48,11 +47,6 @@ class CallActivity : ComposeStreamCallActivity() {
 
     override val uiDelegate: StreamActivityUiDelegate<StreamCallActivity> = StreamDemoUiDelegate()
 
-    override fun loadConfigFromIntent(intent: Intent?): StreamCallActivityConfiguration {
-        return super.loadConfigFromIntent(intent)
-            .copy(closeScreenOnCallEnded = false, canSkipPermissionRationale = false)
-    }
-
     @StreamCallActivityDelicateApi
     override fun onPreCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
         runBlocking {

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

@@ -29,6 +29,7 @@ import androidx.navigation.navArgument
 import io.getstream.video.android.CallActivity
 import io.getstream.video.android.core.notifications.NotificationHandler
 import io.getstream.video.android.ui.common.StreamCallActivity
+import io.getstream.video.android.ui.common.StreamCallActivityConfiguration
 import io.getstream.video.android.ui.join.CallJoinScreen
 import io.getstream.video.android.ui.join.barcode.BarcodeScanner
 import io.getstream.video.android.ui.lobby.CallLobbyScreen
@@ -94,6 +95,10 @@ fun AppNavHost(
                     context.startActivity(
                         StreamCallActivity.callIntent(
                             action = NotificationHandler.ACTION_OUTGOING_CALL,
+                            configuration = StreamCallActivityConfiguration(
+                                closeScreenOnCallEnded = true,
+                            ),
+                            leaveWhenLastInCall = true,
                             context = context,
                             cid = cid,
                             members = members.split(","),

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

@@ -233,6 +233,20 @@ object StreamVideoInitHelper {
                         context,
                         object : DefaultNotificationIntentBundleResolver() {
 
+                            override fun getIncomingCallBundle(
+                                callId: StreamCallId,
+                                notificationId: Int,
+                                payload: Map<String, Any?>,
+                            ): Bundle {
+                                return StreamCallActivity.callIntentBundle(
+                                    callId,
+                                    configuration = StreamCallActivityConfiguration(
+                                        closeScreenOnCallEnded = true,
+                                    ),
+                                    leaveWhenLastInCall = true,
+                                )
+                            }
+
                             override fun getAcceptCallBundle(
                                 callId: StreamCallId,
                                 notificationId: Int,

stream-video-android-core/api/stream-video-android-core.api

@@ -5610,6 +5610,7 @@ public final class io/getstream/video/android/core/CallState {
 	public final fun getPinnedParticipants ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getReactions ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getRecording ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun getRejectActionBundle ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getRejectedBy ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getRemoteParticipants ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getRingingState ()Lkotlinx/coroutines/flow/StateFlow;
@@ -5647,6 +5648,7 @@ public final class io/getstream/video/android/core/CallState {
 	public final fun updateParticipantSortingOrder (Ljava/util/Comparator;)V
 	public final fun updateParticipantVisibility (Ljava/lang/String;Lio/getstream/video/android/core/model/VisibilityOnScreenState;)V
 	public final fun updateParticipantVisibilityFlow (Lkotlinx/coroutines/flow/Flow;)V
+	public final fun updateRejectActionBundle (Landroid/os/Bundle;)V
 	public final fun updateRejectedBy (Ljava/util/Set;)V
 	public final fun upsertParticipants (Ljava/util/List;)V
 }

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

@@ -634,7 +634,7 @@ public class Call(
             )
             session.fastReconnect(reconnectDetails)
         } else {
-            logger.e { "[reconnect] Disconnecting" }
+            logger.d { "[fastReconnect] [RealtimeConnection.Disconnected], call_id:$id" }
             this@Call.state._connection.value = RealtimeConnection.Disconnected
         }
     }
@@ -767,18 +767,19 @@ public class Call(
 
     /** Leave the call, but don't end it for other users */
     fun leave() {
-        logger.d { "[leave] #ringing; no args" }
+        logger.d { "[leave] #ringing; no args, call_cid:$cid" }
         leave(disconnectionReason = null)
     }
 
     private fun leave(disconnectionReason: Throwable?) = atomicLeave {
+        val callId = id
         session?.leaveWithReason(disconnectionReason?.message ?: "user")
         leaveTimeoutAfterDisconnect?.cancel()
         network.unsubscribe(listener)
         sfuListener?.cancel()
         sfuEvents?.cancel()
         state._connection.value = RealtimeConnection.Disconnected
-        logger.v { "[leave] #ringing; disconnectionReason: $disconnectionReason" }
+        logger.v { "[leave] #ringing; disconnectionReason: $disconnectionReason, call_id = $id" }
         if (isDestroyed) {
             logger.w { "[leave] #ringing; Call already destroyed, ignoring" }
             return@atomicLeave
@@ -1318,7 +1319,7 @@ public class Call(
     }
 
     suspend fun accept(): Result<AcceptCallResponse> {
-        logger.d { "[accept] #ringing; no args" }
+        logger.d { "[accept] #ringing; no args, call_id:$id" }
         state.acceptedOnThisDevice = true
 
         clientImpl.state.removeRingingCall()
@@ -1327,7 +1328,7 @@ public class Call(
     }
 
     suspend fun reject(reason: RejectReason? = null): Result<RejectCallResponse> {
-        logger.d { "[reject] #ringing; rejectReason: $reason" }
+        logger.d { "[reject] #ringing; rejectReason: $reason, call_id:$id" }
         return clientImpl.reject(type, id, reason)
     }
 

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

@@ -16,6 +16,7 @@
 
 package io.getstream.video.android.core
 
+import android.os.Bundle
 import android.util.Log
 import androidx.compose.runtime.Stable
 import io.getstream.android.video.generated.models.BlockedUserEvent
@@ -548,6 +549,9 @@ public class CallState(
     private val _rejectedBy: MutableStateFlow<Set<String>> = MutableStateFlow(emptySet())
     val rejectedBy: StateFlow<Set<String>> = _rejectedBy
 
+    private val _rejectActionBundle: MutableStateFlow<Bundle?> = MutableStateFlow(null)
+    val rejectActionBundle: StateFlow<Bundle?> = _rejectActionBundle
+
     internal val _session = MutableStateFlow<CallSessionResponse?>(null)
     val session: StateFlow<CallSessionResponse?> = _session
 
@@ -1529,6 +1533,10 @@ public class CallState(
     fun updateRejectedBy(userId: Set<String>) {
         _rejectedBy.value = userId
     }
+
+    fun updateRejectActionBundle(bundle: Bundle) {
+        _rejectActionBundle.value = bundle
+    }
 }
 
 private fun MemberResponse.toMemberState(): MemberState {

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

@@ -469,6 +469,9 @@ public class RtcSession internal constructor(
                     WebsocketReconnectStrategy.WEBSOCKET_RECONNECT_STRATEGY_DISCONNECT -> {
                         // We are told to disconnect.
                         sfuConnectionModule.socketConnection.disconnect()
+                        logger.d {
+                            "[WebsocketReconnectStrategy.WEBSOCKET_RECONNECT_STRATEGY_DISCONNECT], call_id = ${call.id}"
+                        }
                         call.state._connection.value = RealtimeConnection.Disconnected
                     }
 

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/internal/receivers/RejectCallBroadcastReceiver.kt

@@ -18,6 +18,7 @@ package io.getstream.video.android.core.notifications.internal.receivers
 
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import io.getstream.log.taggedLogger
 import io.getstream.result.Result
 import io.getstream.video.android.core.Call
@@ -39,8 +40,18 @@ internal class RejectCallBroadcastReceiver : GenericCallActionBroadcastReceiver(
 
     override suspend fun onReceive(call: Call, context: Context, intent: Intent) {
         when (val rejectResult = call.reject(RejectReason.Decline)) {
-            is Result.Success -> logger.d { "[onReceive] rejectCall, Success: $rejectResult" }
-            is Result.Failure -> logger.d { "[onReceive] rejectCall, Failure: $rejectResult" }
+            is Result.Success -> {
+                val userId = StreamVideo.instanceOrNull()?.userId
+                userId?.let {
+                    val set = mutableSetOf(it)
+                    call.state.updateRejectedBy(set)
+                    call.state.updateRejectActionBundle(intent.extras ?: Bundle())
+                }
+                logger.d { "[onReceive] rejectCall, Success: $rejectResult" }
+            }
+            is Result.Failure -> {
+                logger.d { "[onReceive] rejectCall, Failure: $rejectResult" }
+            }
         }
         logger.d { "[onReceive] #ringing; callId: ${call.id}, action: ${intent.action}" }
         CallService.removeIncomingCall(

stream-video-android-ui-compose/api/stream-video-android-ui-compose.api

@@ -389,6 +389,7 @@ public class io/getstream/video/android/compose/ui/StreamCallActivityComposeDele
 	public fun AudioCallContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun CallDisconnectedContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun CallFailedContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Ljava/lang/Exception;Landroidx/compose/runtime/Composer;I)V
+	public fun HandleCallRejectionFromNotification (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun IncomingCallContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Landroidx/compose/ui/Modifier;Lio/getstream/video/android/core/Call;ZZLkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public fun LoadingContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun NoAnswerContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V