@capgo/capacitor-stream-call 0.0.78 → 0.0.80

package/android/src/main/AndroidManifest.xml

@@ -18,6 +18,15 @@
             android:name="ee.forgr.capacitor.streamcall.StreamCallBackgroundService"
             android:enabled="true"
             android:exported="false" />
+
+        <receiver
+            android:name=".AcceptCallReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="io.getstream.video.android.action.ACCEPT_CALL" />
+            </intent-filter>
+        </receiver>
     </application>
 
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />

package/android/src/main/java/ee/forgr/capacitor/streamcall/AcceptCallReceiver.kt

@@ -0,0 +1,35 @@
+package ee.forgr.capacitor.streamcall
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import io.getstream.video.android.core.notifications.NotificationHandler
+import io.getstream.video.android.model.streamCallId
+
+class AcceptCallReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        Log.d("AcceptCallReceiver", "onReceive called with action: ${intent?.action}")
+        if (intent?.action == NotificationHandler.ACTION_ACCEPT_CALL) {
+            val cid = intent.streamCallId(NotificationHandler.INTENT_EXTRA_CALL_CID)
+            if (cid == null) {
+                Log.e("AcceptCallReceiver", "Call CID is null, cannot accept call.")
+                return
+            }
+
+            Log.d("AcceptCallReceiver", "Accepting call with CID: $cid")
+
+            // Create an intent to launch the main activity
+            val launchIntent = context?.packageManager?.getLaunchIntentForPackage(context.packageName)
+            if (launchIntent != null) {
+                launchIntent.action = NotificationHandler.ACTION_ACCEPT_CALL
+                launchIntent.putExtra(NotificationHandler.INTENT_EXTRA_CALL_CID, cid)
+                launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                context.startActivity(launchIntent)
+                Log.d("AcceptCallReceiver", "Started MainActivity to handle ACCEPT_CALL action.")
+            } else {
+                Log.e("AcceptCallReceiver", "Could not get launch intent for package.")
+            }
+        }
+    }
+} 

package/android/src/main/java/ee/forgr/capacitor/streamcall/CustomNotificationHandler.kt

@@ -68,26 +68,16 @@ class CustomNotificationHandler(
             )
 
             val acceptCallAction = NotificationHandler.ACTION_ACCEPT_CALL
-            val acceptCallIntent = Intent(acceptCallAction)
-                // Pass full Parcelable so both new and old handlers succeed
-                .putExtra(NotificationHandler.INTENT_EXTRA_CALL_CID, callId)
-                .setPackage(application.packageName)
-
-            if (targetComponent != null) {
-                acceptCallIntent.component = targetComponent
+            val acceptCallIntent = Intent(acceptCallAction).apply {
+                putExtra(NotificationHandler.INTENT_EXTRA_CALL_CID, callId)
+                // Explicitly target our manifest-declared receiver
+                setClass(application, AcceptCallReceiver::class.java)
             }
-            acceptCallIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
 
-            Log.d("CustomNotificationHandler", "Constructed Accept Call Intent for PI: action=${acceptCallIntent.action}, cid=${acceptCallIntent.streamCallId(NotificationHandler.INTENT_EXTRA_CALL_CID)}, package=${acceptCallIntent.getPackage()}, component=${acceptCallIntent.component?.flattenToString()}, flags=${acceptCallIntent.flags}")
+            Log.d("CustomNotificationHandler", "Constructed Accept Call Intent for PI: action=${acceptCallIntent.action}, cid=${acceptCallIntent.streamCallId(NotificationHandler.INTENT_EXTRA_CALL_CID)}, component=${acceptCallIntent.component}")
 
-            // Create PendingIntent for Accept action using getActivity to launch the app
             val requestCodeAccept = callId.cid.hashCode() + 1 // Unique request code for the PendingIntent with offset to avoid collisions
-            val acceptCallPendingIntent = PendingIntent.getActivity(
-                application,
-                requestCodeAccept,
-                acceptCallIntent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
+            val acceptCallPendingIntent = createAcceptCallPendingIntent(callId, requestCodeAccept, acceptCallIntent)
             Log.d("CustomNotificationHandler", "Created Accept Call PendingIntent with requestCode: $requestCodeAccept")
 
             val rejectCallPendingIntent = intentResolver.searchRejectCallPendingIntent(callId) // Keep using resolver for reject for now, or change it too if needed
@@ -127,6 +117,37 @@ class CustomNotificationHandler(
             null
         }
     }
+
+    private fun createAcceptCallPendingIntent(
+        callId: StreamCallId,
+        requestCode: Int,
+        acceptCallIntent: Intent
+    ): PendingIntent? {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            val launchIntent = application.packageManager.getLaunchIntentForPackage(application.packageName)
+            if (launchIntent != null) {
+                launchIntent.action = NotificationHandler.ACTION_ACCEPT_CALL
+                launchIntent.putExtra(NotificationHandler.INTENT_EXTRA_CALL_CID, callId)
+                launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                PendingIntent.getActivity(
+                    application,
+                    requestCode,
+                    launchIntent,
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                )
+            } else {
+                Log.e("CustomNotificationHandler", "Could not get launch intent for package to create Accept PI.")
+                null
+            }
+        } else {
+            PendingIntent.getBroadcast(
+                application,
+                requestCode,
+                acceptCallIntent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+    }
  
     fun customGetIncomingCallNotification(
         fullScreenPendingIntent: PendingIntent,

package/android/src/main/java/ee/forgr/capacitor/streamcall/StreamCallPlugin.kt

@@ -410,6 +410,7 @@ public class StreamCallPlugin : Plugin() {
 
                     CallContent(
                         call = activeCall,
+                        enableInPictureInPicture = false,
                         onBackPressed = { /* Handle back press if needed */ },
                         controlsContent = { /* Empty to disable native controls */ },
                         appBarContent = { /* Empty to disable app bar with stop call button */ },
@@ -510,6 +511,7 @@ public class StreamCallPlugin : Plugin() {
 
                 streamVideoClient = null
                 state = State.NOT_INITIALIZED
+                eventHandlersRegistered = false
 
                 val ret = JSObject()
                 ret.put("success", true)
@@ -550,7 +552,10 @@ public class StreamCallPlugin : Plugin() {
                     android.util.Log.v("StreamCallPlugin", "Plugin's streamVideoClient is null, reusing singleton and registering event handlers")
                     streamVideoClient = StreamVideo.instance()
                     // Register event handlers since streamVideoClient was null
-                    registerEventHandlers()
+                    if (!eventHandlersRegistered) {
+                        registerEventHandlers()
+                        eventHandlersRegistered = true
+                    }
                 } else {
                     android.util.Log.v("StreamCallPlugin", "Plugin already has streamVideoClient, skipping event handler registration")
                 }
@@ -641,8 +646,10 @@ public class StreamCallPlugin : Plugin() {
                 this.state = State.INITIALIZED
                 return
             }
-
-            registerEventHandlers()
+            if (!eventHandlersRegistered) {
+                registerEventHandlers()
+                eventHandlersRegistered = true
+            }
 
             android.util.Log.v("StreamCallPlugin", "Initialization finished")
             initializationTime = System.currentTimeMillis()
@@ -900,7 +907,7 @@ public class StreamCallPlugin : Plugin() {
                             if (connectionState != RealtimeConnection.Disconnected) {
                                 val total = activeCall.state.participantCounts.value?.total
                                 android.util.Log.d("StreamCallPlugin", "CallSessionParticipantLeftEvent: Participant left, remaining: $total");
-                                if (total != null && total <= 2) {
+                                if (total != null && total < 2) {
                                     android.util.Log.d("StreamCallPlugin", "CallSessionParticipantLeftEvent: All remote participants have left call ${activeCall.cid}. Ending call.")
                                     kotlinx.coroutines.GlobalScope.launch(Dispatchers.IO) {
                                         endCallRaw(activeCall)
@@ -1766,7 +1773,7 @@ public class StreamCallPlugin : Plugin() {
             
             // Use call.state.totalParticipants to get participant count (as per StreamVideo Android SDK docs)
             val totalParticipants = call.state.totalParticipants.value ?: 0
-            val shouldEndCall = isCreator || totalParticipants <= 2
+            val shouldEndCall = isCreator || totalParticipants <= 1
             
             android.util.Log.d("StreamCallPlugin", "Call $callId - Creator: $createdBy, CurrentUser: $currentUserId, IsCreator: $isCreator, TotalParticipants: $totalParticipants, ShouldEnd: $shouldEndCall")
             
@@ -2375,14 +2382,14 @@ public class StreamCallPlugin : Plugin() {
 
     private val acceptCallReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
-            android.util.Log.d("StreamCallPlugin", "BroadcastReceiver: Received broadcast with action: ${intent?.action}")
             if (intent?.action == "io.getstream.video.android.action.ACCEPT_CALL") {
+                android.util.Log.d("StreamCallPlugin", "BroadcastReceiver: Received broadcast with action: ${intent.action}")
                 val cid = intent.streamCallId(NotificationHandler.INTENT_EXTRA_CALL_CID)
-                android.util.Log.d("StreamCallPlugin", "BroadcastReceiver: ACCEPT_CALL broadcast received with cid: $cid")
                 if (cid != null) {
-                    android.util.Log.d("StreamCallPlugin", "BroadcastReceiver: Accepting call with cid: $cid")
+                    android.util.Log.d("StreamCallPlugin", "BroadcastReceiver: ACCEPT_CALL broadcast received with cid: $cid")
                     val call = streamVideoClient?.call(id = cid.id, type = cid.type)
                     if (call != null) {
+                        android.util.Log.d("StreamCallPlugin", "BroadcastReceiver: Accepting call with cid: $cid")
                         kotlinx.coroutines.GlobalScope.launch {
                             internalAcceptCall(call, requestPermissionsAfter = !checkPermissions())
                         }
@@ -2421,6 +2428,7 @@ public class StreamCallPlugin : Plugin() {
             }
         }
         private var holder: StreamCallPlugin? = null
+        private var eventHandlersRegistered = false
         
         // Constants for SharedPreferences
         private const val API_KEY_PREFS_NAME = "stream_video_api_key_prefs"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-stream-call",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "description": "Uses the https://getstream.io/ SDK to implement calling in Capacitor",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",