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

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

@@ -39,8 +39,17 @@ 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)
+                }
+                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/src/main/kotlin/io/getstream/video/android/compose/ui/StreamCallActivityComposeDelegate.kt

@@ -38,6 +38,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.SignalWifiBad
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -70,6 +71,7 @@ import io.getstream.video.android.compose.ui.components.video.config.videoRender
 import io.getstream.video.android.core.Call
 import io.getstream.video.android.core.MemberState
 import io.getstream.video.android.core.RealtimeConnection
+import io.getstream.video.android.core.StreamVideo
 import io.getstream.video.android.core.call.CallType
 import io.getstream.video.android.core.call.state.CallAction
 import io.getstream.video.android.core.call.state.CancelCall
@@ -309,6 +311,28 @@ public open class StreamCallActivityComposeDelegate : StreamCallActivityComposeU
                     }
                 }
             }
+
+            /**
+             * Call can be rejected by [RejectCallBroadcastReceiver] so the activity
+             * needs to observe [Call.state.rejectedBy]
+             */
+            val rejectedBy by call.state.rejectedBy.collectAsStateWithLifecycle()
+            LaunchedEffect(rejectedBy) {
+                val currentUserId = StreamVideo.instanceOrNull()?.userId
+                if (rejectedBy.contains(currentUserId)) {
+                    // check if there is no ongoing call then safely finish it else do nothing
+                    val noActiveCall = (StreamVideo.instanceOrNull()?.state?.activeCall?.value == null)
+                    if (noActiveCall) {
+                        onEnded(call)
+                        val configuration = configurationMap[call.id]
+                        if (configuration?.closeScreenOnCallEnded == true) {
+                            safeFinish()
+                        } else {
+                            logger.d { "Don't close activity as some other call is active" }
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -330,7 +354,7 @@ public open class StreamCallActivityComposeDelegate : StreamCallActivityComposeU
         granted: List<String>,
         notGranted: List<String>,
     ) {
-        if (!showRationale && configuration.canSkipPermissionRationale) {
+        if (!showRationale && configurationMap[call.cid]?.canSkipPermissionRationale == true) {
             logger.w { "Permissions were not granted, but rationale is required to be skipped." }
             safeFinish()
         } else {
@@ -351,7 +375,7 @@ public open class StreamCallActivityComposeDelegate : StreamCallActivityComposeU
         val connection by call.state.connection.collectAsStateWithLifecycle()
         when (connection) {
             RealtimeConnection.Disconnected -> {
-                if (!configuration.closeScreenOnCallEnded) {
+                if (configurationMap[call.cid]?.closeScreenOnCallEnded == false) {
                     CallDisconnectedContent(call)
                 } else {
                     // This is just for safety, will be called from other place as well.
@@ -360,7 +384,7 @@ public open class StreamCallActivityComposeDelegate : StreamCallActivityComposeU
             }
 
             is RealtimeConnection.Failed -> {
-                if (!configuration.closeScreenOnError) {
+                if (configurationMap[call.cid]?.closeScreenOnError == false) {
                     val err = Exception("${(connection as? RealtimeConnection.Failed)?.error}")
                     CallFailedContent(call, err)
                 } else {

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

@@ -94,6 +94,7 @@ public abstract class io/getstream/video/android/ui/common/StreamCallActivity :
 	protected fun getCallTransitionTime ()J
 	protected final fun getConfig ()Lio/getstream/video/android/ui/common/StreamCallActivityConfiguration;
 	public fun getConfiguration ()Lio/getstream/video/android/ui/common/StreamCallActivityConfiguration;
+	public final fun getConfigurationMap ()Ljava/util/HashMap;
 	protected final fun getOnErrorFinish ()Lkotlin/jvm/functions/Function2;
 	protected final fun getOnSuccessFinish ()Lkotlin/jvm/functions/Function2;
 	public abstract fun getUiDelegate ()Lio/getstream/video/android/ui/common/StreamActivityUiDelegate;

stream-video-android-ui-core/src/main/kotlin/io/getstream/video/android/ui/common/StreamCallActivity.kt

@@ -177,7 +177,7 @@ public abstract class StreamCallActivity : ComponentActivity(), ActivityCallOper
      * You can get Call id via
      * `intent?.streamCallId(NotificationHandler.INTENT_EXTRA_CALL_CID)?.id`
      */
-    private val configurationMap: HashMap<String, StreamCallActivityConfiguration> =
+    public val configurationMap: HashMap<String, StreamCallActivityConfiguration> =
         HashMap()
 
     private var cachedCallEventJob: Job? = null
@@ -193,11 +193,13 @@ public abstract class StreamCallActivity : ComponentActivity(), ActivityCallOper
             if (configuration?.closeScreenOnCallEnded == true) {
                 safeFinish()
             }
+        } else {
+            logger.d { "[onSuccessFinish] for non-active call" }
         }
     }
 
     /**
-     * The Exception is `StreamCallActivityException`. We will update the args in next major release
+     * The Exception is [StreamCallActivityException]. We will update the args in next major release
      */
     protected val onErrorFinish: suspend (Exception) -> Unit = { error ->
         logger.e(error) { "Something went wrong" }
@@ -210,9 +212,13 @@ public abstract class StreamCallActivity : ComponentActivity(), ActivityCallOper
                     logger.e(error) { "Finishing the activity" }
                     safeFinish()
                 }
+            } else {
+                logger.e(error) { "[onErrorFinish] for non-active call" }
             }
         } else {
-            // older version ~ this flow might never going to be execute (Need to check)
+            /**
+             * This will execute when we got a error before creating the call object
+             */
             if (config.closeScreenOnError) {
                 logger.e(error) { "Finishing the activity" }
                 safeFinish()