@capgo/capacitor-stream-call 0.0.32 → 0.0.34

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

@@ -163,7 +163,7 @@ class CustomNotificationHandler(
         return getNotification {
             priority = NotificationCompat.PRIORITY_HIGH
             setContentTitle(callerName)
-            setContentText("Incoming call toto")
+            setContentText("Incoming call")
             setChannelId(channelId)
             setOngoing(true)
             setAutoCancel(false)

package/ios/Sources/StreamCallPlugin/TouchInterceptView.swift

@@ -5,6 +5,7 @@ import WebKit
 class TouchInterceptView: UIView {
     private weak var webView: UIView?
     private weak var overlayView: UIView?
+    private var touchStartPoint: CGPoint?
     
     func setupWithWebView(_ webView: UIView, overlayView: UIView) {
         self.webView = webView
@@ -43,6 +44,7 @@ class TouchInterceptView: UIView {
         let y = Int(locationInWeb.y)
         let js = """
         (() => {
+            console.log('forwardClickToWeb', \(x), \(y));
             const x = \(x); const y = \(y);
             const el = document.elementFromPoint(x, y);
             if (!el) return 'NO_ELEM';
@@ -75,57 +77,28 @@ class TouchInterceptView: UIView {
         }
     }
 
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        // Forward to web for debugging every touch point
-        os_log(.debug, "TouchInterceptView: hitTest entry at %{public}s. Forwarding click to web.", String(describing: point))
-        forwardClickToWeb(at: point)
-        // 1. interactive hit on overlay (including root)
-        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))
-                return overlayHit
-            }
-        }
-        // 2. webView fallback
-        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))
-            return result
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        os_log(.debug, "TouchInterceptView: touchesBegan at %{public}s", String(describing: touches))
+        if let touch = touches.first {
+            touchStartPoint = touch.location(in: self)
+            os_log(.debug, "TouchInterceptView: touchesBegan at %{public}s", String(describing: touchStartPoint))
         }
-        os_log(.debug, "TouchInterceptView: hitTest - No view found for %{public}s", String(describing: point))
-        return nil
+        super.touchesBegan(touches, with: event)
     }
     
-    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-        guard let webView = self.webView else {
-            os_log(.debug, "TouchInterceptView: point(inside) - webView is nil for point %{public}s. Checking overlay or deferring to super.", String(describing: point))
-            if let overlayView = self.overlayView, !overlayView.isHidden {
-                let overlayPoint = self.convert(point, to: overlayView)
-                let overlayViewConsidersPointInside = overlayView.point(inside: overlayPoint, with: event)
-                os_log(.debug, "TouchInterceptView: point(inside) - webView nil. Overlay (%{public}s) for converted point %{public}s = %s", String(describing: overlayViewConsidersPointInside), String(describing: overlayPoint), String(describing: overlayViewConsidersPointInside))
-                return overlayViewConsidersPointInside
-            }
-            return super.point(inside: point, with: event)
-        }
-        
-        let webViewPoint = self.convert(point, to: webView)
-        let webViewConsidersPointInside = webView.point(inside: webViewPoint, with: event)
-        
-        if let overlayView = self.overlayView, !overlayView.isHidden {
-            let overlayPoint = self.convert(point, to: overlayView)
-            let overlayViewConsidersPointInside = overlayView.point(inside: overlayPoint, with: event)
-            let result = webViewConsidersPointInside || overlayViewConsidersPointInside
-            os_log(.debug, "TouchInterceptView: point(inside) - WebView (%{public}s at %{public}s) OR Visible Overlay (%{public}s at %{public}s) for original point %{public}s = %s", String(describing: webViewConsidersPointInside), String(describing: webViewPoint), String(describing: overlayViewConsidersPointInside), String(describing: overlayPoint), String(describing: point), String(describing: result))
-            return result
-        } else {
-            if self.overlayView == nil {
-                 os_log(.debug, "TouchInterceptView: point(inside) - Overlay nil. WebView (%{public}s at %{public}s) for original point %{public}s = %s", String(describing: webViewConsidersPointInside), String(describing: webViewPoint), String(describing: point), String(describing: webViewConsidersPointInside))
-            } else {
-                 os_log(.debug, "TouchInterceptView: point(inside) - Overlay hidden. WebView (%{public}s at %{public}s) for original point %{public}s = %s", String(describing: webViewConsidersPointInside), String(describing: webViewPoint), String(describing: point), String(describing: webViewConsidersPointInside))
-            }
-            return webViewConsidersPointInside
+    override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+        os_log(.debug, "TouchInterceptView: touchesEnded at %{public}s", String(describing: touches))
+        if let startPoint = touchStartPoint {
+            os_log(.debug, "TouchInterceptView: touchesEnded - forwarding click to web at %{public}s", String(describing: startPoint))
+            forwardClickToWeb(at: startPoint)
         }
+        touchStartPoint = nil
+        super.touchesEnded(touches, with: event)
+    }
+    
+    override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
+        os_log(.debug, "TouchInterceptView: touchesCancelled at %{public}s", String(describing: touches))
+        touchStartPoint = nil
+        super.touchesCancelled(touches, with: event)
     }
 } 

package/package.json

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