@capgo/capacitor-stream-call 0.0.96 → 7.0.2

package/CapgoCapacitorStreamCall.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '14.0'
   s.dependency 'Capacitor'
-  s.dependency 'StreamVideo', '1.29.0'
-  s.dependency 'StreamVideoSwiftUI', '1.29.0'
+  s.dependency 'StreamVideo', '1.29.1'
+  s.dependency 'StreamVideoSwiftUI', '1.29.1'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
-        .package(url: "https://github.com/GetStream/stream-video-swift.git", exact: "1.29.0")
+        .package(url: "https://github.com/GetStream/stream-video-swift.git", exact: "1.29.1")
     ],
     targets: [
         .target(

package/android/build.gradle

@@ -77,8 +77,8 @@ dependencies {
 
     
     // Stream dependencies
-    implementation("io.getstream:stream-video-android-ui-compose:1.9.2")
-    implementation("io.getstream:stream-video-android-core:1.9.2")
+    implementation("io.getstream:stream-video-android-ui-compose:1.10.0")
+    implementation("io.getstream:stream-video-android-core:1.10.0")
     implementation("io.getstream:stream-android-push:1.3.2")
     implementation("io.getstream:stream-android-push-firebase:1.3.2")
     

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

@@ -370,19 +370,6 @@ class StreamCallPlugin : Plugin() {
         val context = context
         val originalParent = bridge?.webView?.parent as? ViewGroup ?: return
 
-        // Wrap original parent with TouchInterceptWrapper to allow touch passthrough
-        val rootParent = originalParent.parent as? ViewGroup
-        val indexInRoot = rootParent?.indexOfChild(originalParent) ?: -1
-        if (rootParent != null && indexInRoot >= 0) {
-            rootParent.removeViewAt(indexInRoot)
-            touchInterceptWrapper = TouchInterceptWrapper(originalParent).apply {
-                setBackgroundColor(Color.TRANSPARENT)
-            }
-            rootParent.addView(touchInterceptWrapper, indexInRoot)
-        }
-
-        val parent: ViewGroup = touchInterceptWrapper ?: originalParent
-
         // Make WebView initially visible and opaque
         bridge?.webView?.setBackgroundColor(Color.WHITE) // Or whatever background color suits your app
 
@@ -394,7 +381,7 @@ class StreamCallPlugin : Plugin() {
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
         }
-        parent.addView(overlayView, 0)  // Add at index 0 to ensure it's below WebView
+        originalParent.addView(overlayView, 0)  // Add at index 0 to ensure it's below WebView
 
         // Initialize with active call content
         setOverlayContent()
@@ -408,7 +395,79 @@ class StreamCallPlugin : Plugin() {
             )
             setBackgroundColor("#1a242c".toColorInt())
         }
-        parent.addView(barrierView, parent.indexOfChild(bridge?.webView) + 1) // Add above WebView
+        originalParent.addView(barrierView, originalParent.indexOfChild(bridge?.webView) + 1) // Add above WebView
+    }
+
+    private fun addTouchInterceptor() {
+        val originalParent = bridge?.webView?.parent as? ViewGroup ?: return
+        
+        // Check if touch interceptor already exists
+        if (touchInterceptWrapper != null) {
+            Log.d("StreamCallPlugin", "Touch interceptor already exists, skipping creation")
+            return
+        }
+        
+        // Wrap original parent with TouchInterceptWrapper to allow touch passthrough
+        val rootParent = originalParent.parent as? ViewGroup
+        val indexInRoot = rootParent?.indexOfChild(originalParent) ?: -1
+        if (rootParent != null && indexInRoot >= 0) {
+            rootParent.removeViewAt(indexInRoot)
+            touchInterceptWrapper = TouchInterceptWrapper(originalParent).apply {
+                setBackgroundColor(Color.TRANSPARENT)
+            }
+            rootParent.addView(touchInterceptWrapper, indexInRoot)
+            
+            // Move views to touch interceptor
+            val parent = touchInterceptWrapper!!
+            if (overlayView?.parent != parent) {
+                (overlayView?.parent as? ViewGroup)?.removeView(overlayView)
+                parent.addView(overlayView, 0)
+            }
+            if (barrierView?.parent != parent) {
+                (barrierView?.parent as? ViewGroup)?.removeView(barrierView)
+                parent.addView(barrierView, parent.indexOfChild(bridge?.webView) + 1)
+            }
+            
+            Log.d("StreamCallPlugin", "Touch interceptor added for active call")
+        }
+    }
+    
+    private fun removeTouchInterceptor() {
+        val touchWrapper = touchInterceptWrapper ?: return
+        val rootParent = touchWrapper.parent as? ViewGroup ?: return
+        val indexInRoot = rootParent.indexOfChild(touchWrapper)
+        
+        // Get the original parent (should be the only child of touchWrapper)
+        val originalParent = touchWrapper.getChildAt(0) as? ViewGroup
+        if (originalParent != null && originalParent !is ComposeView) {
+            // Move views back to original parent (only if it's not a ComposeView)
+            if (overlayView?.parent == touchWrapper) {
+                touchWrapper.removeView(overlayView)
+                originalParent.addView(overlayView, 0)
+            }
+            if (barrierView?.parent == touchWrapper) {
+                touchWrapper.removeView(barrierView)
+                originalParent.addView(barrierView, originalParent.indexOfChild(bridge?.webView) + 1)
+            }
+            
+            // Remove touch wrapper and restore original parent
+            touchWrapper.removeView(originalParent)
+            rootParent.removeView(touchWrapper)
+            rootParent.addView(originalParent, indexInRoot)
+            
+            touchInterceptWrapper = null
+            Log.d("StreamCallPlugin", "Touch interceptor removed after call ended")
+        } else {
+            // If original parent is a ComposeView or null, just remove the touch wrapper
+            // The views will stay where they are
+            if (originalParent != null) {
+                touchWrapper.removeView(originalParent)
+                rootParent.removeView(touchWrapper)
+                rootParent.addView(originalParent, indexInRoot)
+            }
+            touchInterceptWrapper = null
+            Log.d("StreamCallPlugin", "Touch interceptor removed (ComposeView parent case)")
+        }
     }
 
     /**
@@ -1101,6 +1160,10 @@ class StreamCallPlugin : Plugin() {
                 // Show overlay view with the active call and make webview transparent
                 runOnMainThread {
                     Log.d("StreamCallPlugin", "internalAcceptCall: Updating UI for active call ${call.id} - setting overlay visible.")
+                    
+                    // Add touch interceptor for the call
+                    addTouchInterceptor()
+                    
                     bridge?.webView?.setBackgroundColor(Color.TRANSPARENT) // Make webview transparent
                     Log.d("StreamCallPlugin", "internalAcceptCall: WebView background set to transparent for call ${call.id}")
                     bridge?.webView?.bringToFront() // Ensure WebView is on top and transparent
@@ -1474,6 +1537,9 @@ class StreamCallPlugin : Plugin() {
                     streamCall?.microphone?.setEnabled(true)
                     streamCall?.camera?.setEnabled(!isAudioOnly)
 
+                    // Add touch interceptor for the call
+                    addTouchInterceptor()
+                    
                     bridge?.webView?.setBackgroundColor(Color.TRANSPARENT) // Make webview transparent
                     bridge?.webView?.bringToFront() // Ensure WebView is on top and transparent
                     setOverlayContent(streamCall)
@@ -1912,6 +1978,9 @@ class StreamCallPlugin : Plugin() {
             setOverlayContent(call)
             overlayView?.isVisible = false
             bridge?.webView?.setBackgroundColor(Color.WHITE) // Restore webview opacity
+            
+            // Remove touch interceptor
+            removeTouchInterceptor()
 
             // Also hide incoming call view if visible
             Log.d("StreamCallPlugin", "Hiding incoming call view for call $callId")

package/ios/Sources/StreamCallPlugin/StreamCallPlugin.swift

@@ -245,9 +245,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                             print("- In call state detected")
                             print("- All participants: \(String(describing: viewModel.participants))")
                             
-                            // Enable touch interceptor when call becomes active
-                            self.touchInterceptView?.setCallActive(true)
-                            
                             // Create/update overlay and make visible when there's an active call
                             self.createCallOverlayView()
                             
@@ -303,9 +300,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                         } else if newState == .idle {
                             print("Call state changed to idle. CurrentCallId: \(self.currentCallId), ActiveCall: \(String(describing: self.streamVideo?.state.activeCall?.cId))")
                             
-                            // Disable touch interceptor when call becomes inactive
-                            self.touchInterceptView?.setCallActive(false)
-                            
                             // Only notify about call ending if we have a valid stored call ID and there's truly no active call
                             // This prevents false "left" events during normal state transitions
                             if !self.currentCallId.isEmpty && self.streamVideo?.state.activeCall == nil {
@@ -433,9 +427,11 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         Task { @MainActor in
             // self.overlayViewModel?.updateCall(nil)
             // self.overlayViewModel?.updateStreamVideo(nil)
-            self.touchInterceptView?.setCallActive(false)
             self.overlayView?.isHidden = true
             self.webView?.isOpaque = true
+            
+            // Remove touch interceptor if it exists
+            self.removeTouchInterceptor()
         }
 
         call.resolve([
@@ -604,6 +600,9 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                     
                     // Update UI on main thread
                     await MainActor.run {
+                        // Add touch interceptor for the call
+                        self.addTouchInterceptor()
+                        
                         // self.overlayViewModel?.updateCall(streamCall)
                         self.overlayView?.isHidden = false
                         self.webView?.isOpaque = false
@@ -671,9 +670,11 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                     }
                     
                     await MainActor.run {
-                        self.touchInterceptView?.setCallActive(false)
                         self.overlayView?.isHidden = true
                         self.webView?.isOpaque = true
+                        
+                        // Remove touch interceptor
+                        self.removeTouchInterceptor()
                     }
                     
                     call.resolve([
@@ -700,9 +701,11 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                     await callViewModel?.hangUp()
                     
                     await MainActor.run {
-                        self.touchInterceptView?.setCallActive(false)
                         self.overlayView?.isHidden = true
                         self.webView?.isOpaque = true
+                        
+                        // Remove touch interceptor
+                        self.removeTouchInterceptor()
                     }
                     
                     call.resolve([
@@ -809,6 +812,9 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
 
                     // Update the CallOverlayView with the active call
                     await MainActor.run {
+                        // Add touch interceptor for the call
+                        self.addTouchInterceptor()
+                        
                         // self.overlayViewModel?.updateCall(streamCall)
                         self.overlayView?.isHidden = false
                         self.webView?.isOpaque = false
@@ -900,12 +906,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
     private func setupViews() {
         guard let webView = self.webView, let parent = webView.superview else { return }
         
-        // Create the touch intercept view as an overlay for touch passthrough
-        let touchInterceptView = TouchInterceptView(frame: parent.bounds)
-        touchInterceptView.translatesAutoresizingMaskIntoConstraints = false
-        touchInterceptView.backgroundColor = .clear
-        touchInterceptView.isOpaque = false
-        
         // Create SwiftUI view with view model if not already created
         if self.overlayView == nil, let callViewModel = self.callViewModel {
             let hostingController = UIHostingController(rootView: CallOverlayView(viewModel: callViewModel))
@@ -930,16 +930,34 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                 ])
             }
         }
+    }
+    
+    private func addTouchInterceptor() {
+        guard let webView = self.webView, let parent = webView.superview else { return }
+        
+        // Check if touch interceptor already exists
+        if self.touchInterceptView != nil {
+            print("Touch interceptor already exists, skipping creation")
+            return
+        }
+        
+        // Create the touch intercept view as an overlay for touch passthrough
+        let touchInterceptView = TouchInterceptView(frame: parent.bounds)
+        touchInterceptView.translatesAutoresizingMaskIntoConstraints = false
+        touchInterceptView.backgroundColor = .clear
+        touchInterceptView.isOpaque = false
         
         // Setup touch intercept view with references to webview and overlay
         if let overlayView = self.overlayView {
             touchInterceptView.setupWithWebView(webView, overlayView: overlayView)
-            // Insert touchInterceptView above webView
-            parent.insertSubview(touchInterceptView, aboveSubview: webView)
+            // Add touchInterceptView as the topmost view
+            parent.addSubview(touchInterceptView)
+            parent.bringSubviewToFront(touchInterceptView)
         } else {
             // If overlayView is not present, just add on top of webView
             touchInterceptView.setupWithWebView(webView, overlayView: webView)
-            parent.insertSubview(touchInterceptView, aboveSubview: webView)
+            parent.addSubview(touchInterceptView)
+            parent.bringSubviewToFront(touchInterceptView)
         }
         
         // Set up active call check function
@@ -957,6 +975,18 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             touchInterceptView.leadingAnchor.constraint(equalTo: parent.leadingAnchor),
             touchInterceptView.trailingAnchor.constraint(equalTo: parent.trailingAnchor)
         ])
+        
+        print("Touch interceptor added for active call - view hierarchy: \(parent.subviews.map { type(of: $0) })")
+    }
+    
+    private func removeTouchInterceptor() {
+        guard let touchInterceptView = self.touchInterceptView else { return }
+        
+        // Remove touch interceptor from view hierarchy
+        touchInterceptView.removeFromSuperview()
+        self.touchInterceptView = nil
+        
+        print("Touch interceptor removed after call ended")
     }
     
     private func createCallOverlayView() {
@@ -1004,43 +1034,8 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         self.hostingController = overlayView
         self.overlayView = overlayView.view
         
-        // Ensure touch intercept view is on top
-        if let touchInterceptView = parent.subviews.first(where: { $0 is TouchInterceptView }) {
-            parent.bringSubviewToFront(touchInterceptView)
-            // Update reference and set call active
-            self.touchInterceptView = touchInterceptView as? TouchInterceptView
-            
-            // Set up active call check function
-            self.touchInterceptView?.setActiveCallCheck { [weak self] in
-                return self?.streamVideo?.state.activeCall != nil
-            }
-            
-            self.touchInterceptView?.setCallActive(true)
-        } else {
-            // Create touch intercept view if not already created
-            let touchInterceptView = TouchInterceptView(frame: parent.bounds)
-            touchInterceptView.translatesAutoresizingMaskIntoConstraints = false
-            touchInterceptView.backgroundColor = .clear
-            touchInterceptView.isOpaque = false
-            touchInterceptView.setupWithWebView(webView, overlayView: overlayView.view)
-            parent.addSubview(touchInterceptView)
-            
-            // Set up active call check function
-            touchInterceptView.setActiveCallCheck { [weak self] in
-                return self?.streamVideo?.state.activeCall != nil
-            }
-            
-            // Store reference and set call active
-            self.touchInterceptView = touchInterceptView
-            self.touchInterceptView?.setCallActive(true)
-            
-            NSLayoutConstraint.activate([
-                touchInterceptView.topAnchor.constraint(equalTo: parent.topAnchor),
-                touchInterceptView.bottomAnchor.constraint(equalTo: parent.bottomAnchor),
-                touchInterceptView.leadingAnchor.constraint(equalTo: parent.leadingAnchor),
-                touchInterceptView.trailingAnchor.constraint(equalTo: parent.trailingAnchor)
-            ])
-        }
+        // Add touch interceptor if not already present
+        self.addTouchInterceptor()
     }
     
     // MARK: - Dynamic API Key Management
@@ -1066,9 +1061,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
     }
     
     func ensureViewRemoved() {
-        // Disable touch interceptor when overlay is removed
-        self.touchInterceptView?.setCallActive(false)
-        
         // Check if we have an overlay view
         if let existingOverlayView = self.overlayView {
             print("Hiding call overlay view")
@@ -1083,6 +1075,9 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         } else {
             print("No call overlay view to hide")
         }
+        
+        // Remove touch interceptor
+        self.removeTouchInterceptor()
     }
 
     @objc func getCallStatus(_ call: CAPPluginCall) {

package/ios/Sources/StreamCallPlugin/TouchInterceptView.swift

@@ -9,7 +9,6 @@ class TouchInterceptView: UIView {
     private var lastTouchPoint: CGPoint?
     private let touchThreshold: CGFloat = 5.0 // pixels
     private let timerDelay: TimeInterval = 0.1 // seconds
-    private var isCallActive: Bool = false
     private var hasActiveCallCheck: (() -> Bool)?
     
     func setupWithWebView(_ webView: UIView, overlayView: UIView) {
@@ -26,28 +25,10 @@ class TouchInterceptView: UIView {
         self.hasActiveCallCheck = check
     }
     
-    func setCallActive(_ active: Bool) {
-        self.isCallActive = active
-        // os_log(.debug, "TouchInterceptView: setCallActive - %{public}s", String(describing: active))
-        
-        // Cancel any pending timer when call becomes inactive
-        if !active {
-            forwardTimer?.invalidate()
-            forwardTimer = nil
-            lastTouchPoint = nil
-        }
-    }
-    
     private func shouldInterceptTouches() -> Bool {
-        // Check both our flag and actual call state
+        // Check if there's an active call
         let hasActiveCall = hasActiveCallCheck?() ?? false
-        let shouldIntercept = isCallActive && hasActiveCall
-        
-        if isCallActive != hasActiveCall {
-            // os_log(.debug, "TouchInterceptView: State mismatch - isCallActive: %{public}s, hasActiveCall: %{public}s", String(describing: isCallActive), String(describing: hasActiveCall))
-        }
-        
-        return shouldIntercept
+        return hasActiveCall
     }
     
     private func isInteractive(_ view: UIView) -> Bool {
@@ -130,16 +111,21 @@ class TouchInterceptView: UIView {
         
         // Check if we should intercept touches
         if !shouldInterceptTouches() {
+            // Cancel any pending timer when not in a call
+            forwardTimer?.invalidate()
+            forwardTimer = nil
+            lastTouchPoint = nil
+            
             if let webView = self.webView {
                 let webPoint = self.convert(point, to: webView)
                 let result = webView.hitTest(webPoint, with: event)
-//                os_log(.debug, "TouchInterceptView: hitTest - Not intercepting, direct WebView result %{public}s at %{public}s", String(describing: result), String(describing: webPoint))
+                print("TouchInterceptView: hitTest - Not intercepting (no active call), direct WebView result \(String(describing: result)) at \(webPoint)")
                 return result
             }
             return nil
         }
         
-        // os_log(.debug, "TouchInterceptView: hitTest entry at %{public}s, callActive: %{public}s", String(describing: point), String(describing: isCallActive))
+        print("TouchInterceptView: hitTest intercepting touch at \(point)")
         
         // Check if this is same touch location continuing
         if let lastPoint = lastTouchPoint {
@@ -167,7 +153,7 @@ class TouchInterceptView: UIView {
         if let overlayView = self.overlayView, !overlayView.isHidden {
             let overlayPoint = self.convert(point, to: overlayView)
             if let overlayHit = nonGreedyInteractiveHitTest(in: overlayView, point: overlayPoint, with: event) {
-                // os_log(.debug, "TouchInterceptView: hitTest - Overlay view %{public}s at %{public}s", String(describing: overlayHit), String(describing: overlayPoint))
+                print("TouchInterceptView: hitTest - Hit overlay view \(String(describing: overlayHit)) at \(overlayPoint)")
                 return overlayHit
             }
         }
@@ -175,10 +161,10 @@ class TouchInterceptView: UIView {
         if let webView = self.webView {
             let webPoint = self.convert(point, to: webView)
             let result = webView.hitTest(webPoint, with: event)
-            // os_log(.debug, "TouchInterceptView: hitTest - WebView result %{public}s at %{public}s", String(describing: result), String(describing: webPoint))
+            print("TouchInterceptView: hitTest - WebView fallback result \(String(describing: result)) at \(webPoint)")
             return result
         }
-        // os_log(.debug, "TouchInterceptView: hitTest - No view found for %{public}s", String(describing: point))
+        print("TouchInterceptView: hitTest - No view found for \(point)")
         return nil
     }
     

package/package.json

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