@capgo/capacitor-stream-call 7.0.5 → 7.1.0

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

@@ -350,7 +350,7 @@ class StreamCallPlugin : Plugin() {
                 changeActivityAsVisibleOnLockScreen(this@StreamCallPlugin.activity, false)
 
                 // Notify that call has ended using our helper
-                updateCallStatusAndNotify(call.id, "rejected")
+                updateCallStatusAndNotify(call.cid, "rejected")
 
                 hideIncomingCall()
             } catch (e: Exception) {
@@ -1235,8 +1235,8 @@ class StreamCallPlugin : Plugin() {
                 Log.d("StreamCallPlugin", "internalAcceptCall: setActiveCall completed for call ${call.id}")
 
                 // Notify that call has started using helper
-                updateCallStatusAndNotify(call.id, "joined")
-                Log.d("StreamCallPlugin", "internalAcceptCall: updateCallStatusAndNotify(joined) called for ${call.id}")
+                updateCallStatusAndNotify(call.cid, "joined")
+                Log.d("StreamCallPlugin", "internalAcceptCall: updateCallStatusAndNotify(joined) called for ${call.cid}")
 
                 // Show overlay view with the active call and make webview transparent
                 runOnMainThread {
@@ -1983,7 +1983,7 @@ class StreamCallPlugin : Plugin() {
 
     @OptIn(InternalStreamVideoApi::class)
     private suspend fun endCallRaw(call: Call) {
-        val callId = call.id
+        val callId = call.cid
         Log.d("StreamCallPlugin", "Attempting to end call $callId")
         
         try {
@@ -2107,7 +2107,7 @@ class StreamCallPlugin : Plugin() {
 
     @OptIn(DelicateCoroutinesApi::class)
     private fun transEndCallRaw(call: Call) {
-        val callId = call.id
+        val callId = call.cid
         val savedCapacitorActivity = savedActivity
         if (savedCapacitorActivity == null) {
             Log.d("StreamCallPlugin", "Cannot perform transEndCallRaw for call $callId. savedCapacitorActivity is null")

package/ios/Sources/StreamCallPlugin/StreamCallPlugin.swift

@@ -49,6 +49,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
     private var activeCallSubscription: AnyCancellable?
     private var lastVoIPToken: String?
     private var touchInterceptView: TouchInterceptView?
+    private var needsTouchInterceptorSetup: Bool = false
 
     private var streamVideo: StreamVideo?
 
@@ -71,6 +72,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
 
     // Helper method to update call status and notify listeners
     private func updateCallStatusAndNotify(callId: String, state: String, userId: String? = nil, reason: String? = nil, caller: [String: Any]? = nil, members: [[String: Any]]? = nil) {
+        print("updateCallStatusAndNotify: callId: \(callId), state: \(state)")
         // Update stored call info
         currentCallId = callId
         currentCallState = state
@@ -241,6 +243,9 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                             print("- In call state detected")
                             print("- All participants: \(String(describing: viewModel.participants))")
                             
+                            // Ensure views are set up first (important when accepting call from notification)
+                            self.setupViews()
+                            
                             // Create/update overlay and make visible when there's an active call
                             self.createCallOverlayView()
                             
@@ -290,8 +295,9 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                                     print("Failed to get call info for caller details: \(error)")
                                 }
                                 
-                                // Notify with caller information
-                                self.updateCallStatusAndNotify(callId: incomingCall.id, state: "ringing", caller: caller, members: members)
+                                // Notify with caller information  
+                                let fullCallId = "\(incomingCall.type):\(incomingCall.id)"
+                                self.updateCallStatusAndNotify(callId: fullCallId, state: "ringing", caller: caller, members: members)
                             }
                         } else if newState == .idle {
                             print("Call state changed to idle. CurrentCallId: \(self.currentCallId), ActiveCall: \(String(describing: self.streamVideo?.state.activeCall?.cId))")
@@ -592,7 +598,8 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                     }
                     
                     // Now send the created event with complete member data
-                    self.updateCallStatusAndNotify(callId: callId, state: "created", members: allMembers)
+                    let fullCallId = "\(callType):\(callId)"
+                    self.updateCallStatusAndNotify(callId: fullCallId, state: "created", members: allMembers)
                     
                     // Update UI on main thread
                     await MainActor.run {
@@ -808,12 +815,19 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
 
                     // Update the CallOverlayView with the active call
                     await MainActor.run {
+                        print("acceptCall: Setting up UI for accepted call")
+                        
+                        // Ensure views are set up first
+                        self.setupViews()
+                        
                         // Add touch interceptor for the call
                         self.addTouchInterceptor()
                         
                         // self.overlayViewModel?.updateCall(streamCall)
                         self.overlayView?.isHidden = false
                         self.webView?.isOpaque = false
+                        
+                        print("acceptCall: UI setup complete - overlay visible: \(!self.overlayView!.isHidden), touch interceptor: \(self.touchInterceptView != nil)")
                     }
 
                     call.resolve([
@@ -926,10 +940,32 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                 ])
             }
         }
+        
+        // Check if we have an active call and need to add touch interceptor
+        if let activeCall = self.streamVideo?.state.activeCall {
+            print("Active call detected during setupViews, ensuring touch interceptor is added")
+            // Make overlay visible if there's an active call
+            self.overlayView?.isHidden = false
+            self.webView?.isOpaque = false
+            // Add touch interceptor if not already present
+            self.addTouchInterceptor()
+        } else if self.needsTouchInterceptorSetup {
+            // If we previously tried to add touch interceptor but webview wasn't ready
+            print("Deferred touch interceptor setup detected, attempting to add now")
+            self.addTouchInterceptor()
+            // Reset the flag if successful
+            if self.touchInterceptView != nil {
+                self.needsTouchInterceptorSetup = false
+            }
+        }
     }
     
     private func addTouchInterceptor() {
-        guard let webView = self.webView, let parent = webView.superview else { return }
+        guard let webView = self.webView, let parent = webView.superview else {
+            print("Cannot add touch interceptor - webView or parent not ready, marking for deferred setup")
+            self.needsTouchInterceptorSetup = true
+            return
+        }
         
         // Check if touch interceptor already exists
         if self.touchInterceptView != nil {
@@ -981,6 +1017,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         // Remove touch interceptor from view hierarchy
         touchInterceptView.removeFromSuperview()
         self.touchInterceptView = nil
+        self.needsTouchInterceptorSetup = false
         
         print("Touch interceptor removed after call ended")
     }

package/package.json

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