@capgo/capacitor-stream-call 0.0.25-alpha.0 → 0.0.27

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

@@ -1,5 +1,5 @@
 package ee.forgr.capacitor.streamcall
-
+ 
 import android.app.Application
 import android.app.Notification
 import android.app.NotificationManager
@@ -8,13 +8,17 @@ import android.content.Context
 import android.content.Intent
 import android.media.RingtoneManager
 import android.os.Build
+import android.util.Log
 import androidx.core.app.NotificationCompat
+import io.getstream.log.taggedLogger
+import io.getstream.video.android.core.RingingState
 import io.getstream.video.android.core.notifications.DefaultNotificationHandler
+import io.getstream.video.android.core.notifications.NotificationHandler
 import io.getstream.video.android.model.StreamCallId
-
+ 
 // declare "incoming_calls_custom" as a constant
 const val INCOMING_CALLS_CUSTOM = "incoming_calls_custom"
-
+ 
 class CustomNotificationHandler(
     val application: Application,
     private val endCall: (callId: StreamCallId) -> Unit = {},
@@ -25,17 +29,89 @@ class CustomNotificationHandler(
         private const val KEY_NOTIFICATION_TIME = "notification_creation_time"
     }
     private var allowSound = true;
-
-    override fun getIncomingCallNotification(
+ 
+    override fun getRingingCallNotification(
+        ringingState: RingingState,
+        callId: StreamCallId,
+        callDisplayName: String?,
+        shouldHaveContentIntent: Boolean,
+    ): Notification? {
+        return if (ringingState is RingingState.Incoming) {
+            val fullScreenPendingIntent = intentResolver.searchIncomingCallPendingIntent(callId)
+            val acceptCallPendingIntent = intentResolver.searchAcceptCallPendingIntent(callId)
+            val rejectCallPendingIntent = intentResolver.searchRejectCallPendingIntent(callId)
+ 
+            if (fullScreenPendingIntent != null && acceptCallPendingIntent != null && rejectCallPendingIntent != null) {
+                customGetIncomingCallNotification(
+                    fullScreenPendingIntent,
+                    acceptCallPendingIntent,
+                    rejectCallPendingIntent,
+                    callDisplayName,
+                    shouldHaveContentIntent,
+                    callId
+                )
+            } else {
+                Log.e("CustomNotificationHandler", "Ringing call notification not shown, one of the intents is null.")
+                null
+            }
+        } else if (ringingState is RingingState.Outgoing) {
+            val outgoingCallPendingIntent = intentResolver.searchOutgoingCallPendingIntent(callId)
+            val endCallPendingIntent = intentResolver.searchEndCallPendingIntent(callId)
+ 
+            if (outgoingCallPendingIntent != null && endCallPendingIntent != null) {
+                getOngoingCallNotification(
+                    callId,
+                    callDisplayName,
+                    isOutgoingCall = true,
+                )
+            } else {
+                Log.e("CustomNotificationHandler", "Ringing call notification not shown, one of the intents is null.")
+                null
+            }
+        } else {
+            null
+        }
+    }
+ 
+    fun customGetIncomingCallNotification(
         fullScreenPendingIntent: PendingIntent,
         acceptCallPendingIntent: PendingIntent,
         rejectCallPendingIntent: PendingIntent,
         callerName: String?,
         shouldHaveContentIntent: Boolean,
+        callId: StreamCallId
     ): Notification {
-
-        customCreateIncomingCallChannel()
-
+ 
+        // customCreateIncomingCallChannel()
+        val manufacturer = Build.MANUFACTURER.lowercase()
+        if (manufacturer.contains("xiaomi") || manufacturer.contains("mi")) {
+            // val serviceIntent = Intent(application, CallForegroundService::class.java)
+            // serviceIntent.action = CallForegroundService.ACTION_START_FOREGROUND_SERVICE
+            // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            //     application.startForegroundService(serviceIntent)
+            // } else {
+            //     application.startService(serviceIntent)
+            // }
+            // Adjust PendingIntent for Xiaomi to avoid permission denial
+            val xiaomiAcceptIntent = PendingIntent.getActivity(
+                application,
+                0,
+                Intent("io.getstream.video.android.action.ACCEPT_CALL")
+                .setPackage(application.packageName)
+                .putExtra(NotificationHandler.INTENT_EXTRA_CALL_CID, callId),
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            return buildNotification(
+                fullScreenPendingIntent,
+                xiaomiAcceptIntent,
+                rejectCallPendingIntent,
+                callerName,
+                shouldHaveContentIntent,
+                INCOMING_CALLS_CUSTOM,
+                true // Include sound
+            )
+        }
+ 
         return buildNotification(
             fullScreenPendingIntent,
             acceptCallPendingIntent,
@@ -46,7 +122,7 @@ class CustomNotificationHandler(
             true // Include sound
         )
     }
-
+ 
     fun buildNotification(
         fullScreenPendingIntent: PendingIntent,
         acceptCallPendingIntent: PendingIntent,
@@ -64,10 +140,10 @@ class CustomNotificationHandler(
             setOngoing(true)
             setAutoCancel(false)
             setCategory(NotificationCompat.CATEGORY_CALL)
-            
+ 
             // Clear all defaults first
             setDefaults(0)
-            
+ 
             if (includeSound && allowSound) {
                 setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE))
                 setDefaults(NotificationCompat.DEFAULT_VIBRATE or NotificationCompat.DEFAULT_LIGHTS)
@@ -75,7 +151,7 @@ class CustomNotificationHandler(
                 setSound(null)
                 setDefaults(NotificationCompat.DEFAULT_VIBRATE or NotificationCompat.DEFAULT_LIGHTS)
             }
-            
+ 
             // setVibrate(longArrayOf(0, 1000, 500, 1000))
             setLights(0xFF0000FF.toInt(), 1000, 1000)
             setFullScreenIntent(fullScreenPendingIntent, true)
@@ -95,12 +171,12 @@ class CustomNotificationHandler(
             // flags = flags or NotificationCompat.FLAG_ONGOING_EVENT
         }
     }
-
+ 
     override fun onMissedCall(callId: StreamCallId, callDisplayName: String) {
         endCall(callId)
         super.onMissedCall(callId, callDisplayName)
     }
-
+ 
     private fun customCreateIncomingCallChannel() {
         maybeCreateChannel(
             channelId = INCOMING_CALLS_CUSTOM,
@@ -114,7 +190,7 @@ class CustomNotificationHandler(
                     importance = NotificationManager.IMPORTANCE_HIGH
                     this.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
                     this.setShowBadge(true)
-                    
+ 
                     // Set the channel to be silent since we handle sound via RingtonePlayer
                     setSound(null, null)
                     enableVibration(true)
@@ -126,8 +202,9 @@ class CustomNotificationHandler(
             },
         )
     }
-
+ 
     public fun clone(): CustomNotificationHandler {
         return CustomNotificationHandler(this.application, this.endCall, this.incomingCall)
     }
 }
+ 

package/ios/Sources/StreamCallPlugin/CallOverlayView.swift

@@ -57,7 +57,7 @@ struct CallOverlayView: View {
     }
 
     private func changeTrackVisibility(_ participant: CallParticipant?, isVisible: Bool) {
-        StreamCallPlugin.dualprint("changeTrackVisibility for \(String(describing: participant?.userId)), visible: \(isVisible)")
+        print("changeTrackVisibility for \(String(describing: participant?.userId)), visible: \(isVisible)")
         guard let participant = participant,
               let call = viewModel.call else { return }
         Task {

package/ios/Sources/StreamCallPlugin/CustomVideoParticipantsView.swift

@@ -29,7 +29,7 @@ public struct CustomVideoCallParticipantView<Factory: ViewFactory>: View {
         customData: [String: RawJSON],
         call: Call?
     ) {
-        StreamCallPlugin.dualprint("size: \(availableFrame.size)")
+        print("size: \(availableFrame.size)")
         self.viewFactory = viewFactory
         self.participant = participant
         self.id = id ?? participant.id

package/ios/Sources/StreamCallPlugin/ParticipantsView.swift

@@ -34,8 +34,8 @@ extension View {
                                 value: [ViewFramePreferenceData(label: label,
                                                                 frame: geo.frame(in: .global))])
                     .onAppear {
-                        StreamCallPlugin.dualprint("ParticipantsView - Collecting frame for label: \(label)")
-                        StreamCallPlugin.dualprint("Frame: \(geo.frame(in: .global))")
+                        print("ParticipantsView - Collecting frame for label: \(label)")
+                        print("Frame: \(geo.frame(in: .global))")
                     }
             }
         )

package/ios/Sources/StreamCallPlugin/StreamCallPlugin.swift

@@ -5,7 +5,6 @@ import StreamVideoSwiftUI
 import SwiftUI
 import Combine
 import WebKit
-import os.log
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
@@ -28,15 +27,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getCallStatus", returnType: CAPPluginReturnPromise)
     ]
 
-    // OSLog for streamcall plugin
-    private static let osLog = OSLog(subsystem: "com.example.plugin.streamcall", category: "StreamCallPlugin")
-    
-    // Static function for dual printing to console and os.log
-    public static func dualprint(_ message: String) {
-        print(message)
-        os_log("%{public}@", log: osLog, type: .info, message)
-    }
-
     private enum State {
         case notInitialized
         case initializing
@@ -44,8 +34,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
     }
     private var apiKey: String?
     private var state: State = .notInitialized
-    private static let tokenRefreshQueue = DispatchQueue(label: "stream.call.token.refresh")
-    private static let tokenRefreshSemaphore = DispatchSemaphore(value: 1)
     private var currentToken: String?
     private var tokenWaitSemaphore: DispatchSemaphore?
 
@@ -66,9 +54,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
     @Injected(\.callKitPushNotificationAdapter) var callKitPushNotificationAdapter
     private var webviewDelegate: WebviewNavigationDelegate?
 
-    // Add class property to store call states
-    private var callStates: [String: (members: [MemberResponse], participantResponses: [String: String], createdAt: Date, timer: Timer?)] = [:]
-
     // Declare as optional and initialize in load() method
     private var callViewModel: CallViewModel?
 
@@ -107,7 +92,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         
         // Check if we have a logged in user for handling incoming calls
         if let credentials = SecureUserRepository.shared.loadCurrentUser() {
-            StreamCallPlugin.dualprint("Loading user for StreamCallPlugin: \(credentials.user.name)")
+            print("Loading user for StreamCallPlugin: \(credentials.user.name)")
             DispatchQueue.global(qos: .userInitiated).async {
                 self.initializeStreamVideo()
             }
@@ -118,7 +103,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             wrappedDelegate: self.webView?.navigationDelegate,
             onSetupOverlay: { [weak self] in
                 guard let self = self else { return }
-                StreamCallPlugin.dualprint("Attempting to setup call view")
+                print("Attempting to setup call view")
 
                 self.setupViews()
             }
@@ -138,7 +123,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
-        StreamCallPlugin.dualprint("loginMagicToken received token")
+        print("loginMagicToken received token")
         currentToken = token
         tokenWaitSemaphore?.signal()
         call.resolve()
@@ -153,17 +138,17 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             guard let self = self else { return }
             Task {
                 do {
-                    StreamCallPlugin.dualprint("Setting up token subscription")
+                    print("Setting up token subscription")
                     try self.requireInitialized()
                     if let lastVoIPToken = self.lastVoIPToken, !lastVoIPToken.isEmpty {
-                        StreamCallPlugin.dualprint("Deleting device: \(lastVoIPToken)")
+                        print("Deleting device: \(lastVoIPToken)")
                         try await self.streamVideo?.deleteDevice(id: lastVoIPToken)
                     }
                     if !updatedDeviceToken.isEmpty {
-                        StreamCallPlugin.dualprint("Setting voip device: \(updatedDeviceToken)")
+                        print("Setting voip device: \(updatedDeviceToken)")
                         try await self.streamVideo?.setVoipDevice(id: updatedDeviceToken)
                         // Save the token to our secure storage
-                        StreamCallPlugin.dualprint("Saving voip token: \(updatedDeviceToken)")
+                        print("Saving voip token: \(updatedDeviceToken)")
                         SecureUserRepository.shared.save(voipPushToken: updatedDeviceToken)
                     }
                     self.lastVoIPToken = updatedDeviceToken
@@ -185,7 +170,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             
             // Verify callViewModel exists
             guard let callViewModel = self.callViewModel, let streamVideo = self.streamVideo else {
-                StreamCallPlugin.dualprint("Warning: setupActiveCallSubscription called but callViewModel or streamVideo is nil")
+                print("Warning: setupActiveCallSubscription called but callViewModel or streamVideo is nil")
                 // Schedule a retry after a short delay if callViewModel is nil
                 DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
                     self?.setupActiveCallSubscription()
@@ -193,7 +178,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
             
-            StreamCallPlugin.dualprint("Setting up active call subscription")
+            print("Setting up active call subscription")
             
             // Create a strong reference to callViewModel to ensure it's not deallocated
             // while the subscription is active
@@ -205,7 +190,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                 .sink { [weak self, weak viewModel] activeCall in
                     guard let self = self, let viewModel = viewModel else { return }
                     
-                    StreamCallPlugin.dualprint("Active call update from streamVideo: \(String(describing: activeCall?.cId))")
+                    print("Active call update from streamVideo: \(String(describing: activeCall?.cId))")
                     
                     if let activeCall = activeCall {
                         // Sync callViewModel with activeCall from streamVideo state
@@ -222,24 +207,24 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                 .receive(on: DispatchQueue.main)
                 .sink { [weak self, weak viewModel] newState in
                     guard let self = self, let viewModel = viewModel else {
-                        StreamCallPlugin.dualprint("Warning: Call state update received but self or viewModel is nil")
+                        print("Warning: Call state update received but self or viewModel is nil")
                         return
                     }
                     
                     do {
                         try self.requireInitialized()
-                        StreamCallPlugin.dualprint("Call State Update: \(newState)")
+                        print("Call State Update: \(newState)")
                         
                         if newState == .inCall {
-                            StreamCallPlugin.dualprint("- In call state detected")
-                            StreamCallPlugin.dualprint("- All participants: \(String(describing: viewModel.participants))")
+                            print("- In call state detected")
+                            print("- All participants: \(String(describing: viewModel.participants))")
                             
                             // Create/update overlay and make visible when there's an active call
                             self.createCallOverlayView()
                             
                             // Notify that a call has started - but only if we haven't notified for this call yet
                             if let callId = viewModel.call?.cId, !self.hasNotifiedCallJoined || callId != self.currentCallId {
-                                StreamCallPlugin.dualprint("Notifying call joined: \(callId)")
+                                print("Notifying call joined: \(callId)")
                                 self.updateCallStatusAndNotify(callId: callId, state: "joined")
                                 self.hasNotifiedCallJoined = true
                             }
@@ -248,7 +233,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                         } else if newState == .idle && self.streamVideo?.state.activeCall == nil {
                             // Get the call ID that was active before the state changed
                             let endingCallId = viewModel.call?.cId
-                            StreamCallPlugin.dualprint("Call ending: \(String(describing: endingCallId))")
+                            print("Call ending: \(String(describing: endingCallId))")
                             
                             // Notify that call has ended - use the properly tracked call ID
                             self.updateCallStatusAndNotify(callId: endingCallId ?? "", state: "left")
@@ -256,17 +241,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                             // Reset notification flag when call ends
                             self.hasNotifiedCallJoined = false
                             
-                            // Clean up any resources for this call
-                            if let callCid = endingCallId {
-                                // Invalidate and remove the timer
-                                self.callStates[callCid]?.timer?.invalidate()
-                                
-                                // Remove call from callStates
-                                self.callStates.removeValue(forKey: callCid)
-                                
-                                StreamCallPlugin.dualprint("Cleaned up resources for ended call: \(callCid)")
-                            }
-                            
                             // Remove the call overlay view when not in a call
                             self.ensureViewRemoved()
                         }
@@ -281,7 +255,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                 statePublisher.cancel()
             }
             
-            StreamCallPlugin.dualprint("Active call subscription setup completed")
+            print("Active call subscription setup completed")
             
             // Schedule a periodic check to ensure subscription is active
             self.scheduleSubscriptionCheck()
@@ -296,7 +270,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             
             // Check if we're in a state where we need the subscription but it's not active
             if self.state == .initialized && self.activeCallSubscription == nil && self.callViewModel != nil {
-                StreamCallPlugin.dualprint("Subscription check: Restoring lost activeCallSubscription")
+                print("Subscription check: Restoring lost activeCallSubscription")
                 self.setupActiveCallSubscription()
             } else {
                 // Schedule the next check
@@ -305,134 +279,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-    @objc private func checkCallTimeoutTimer(_ timer: Timer) {
-        guard let callCid = timer.userInfo as? String else { return }
-
-        Task { [weak self] in
-            guard let self = self else { return }
-            await self.checkCallTimeout(callCid: callCid)
-        }
-    }
-
-    private func checkCallTimeout(callCid: String) async {
-        // Get a local copy of the call state from the main thread
-        let callState: (members: [MemberResponse], participantResponses: [String: String], createdAt: Date, timer: Timer?)? = await MainActor.run {
-            return self.callStates[callCid]
-        }
-
-        guard let callState = callState else { return }
-
-        // Calculate time elapsed since call creation
-        let now = Date()
-        let elapsedSeconds = now.timeIntervalSince(callState.createdAt)
-
-        // Check if 30 seconds have passed
-        if elapsedSeconds >= 30.0 {
-
-            // Check if anyone has accepted
-            let hasAccepted = callState.participantResponses.values.contains { $0 == "accepted" }
-
-            if !hasAccepted {
-                StreamCallPlugin.dualprint("Call \(callCid) has timed out after \(elapsedSeconds) seconds")
-                StreamCallPlugin.dualprint("No one accepted call \(callCid), marking all non-responders as missed")
-
-                // Mark all members who haven't responded as "missed"
-                for member in callState.members {
-                    let memberId = member.userId
-                    let needsToBeMarkedAsMissed = await MainActor.run {
-                        return self.callStates[callCid]?.participantResponses[memberId] == nil
-                    }
-
-                    if needsToBeMarkedAsMissed {
-                        // Update callStates map on main thread
-                        await MainActor.run {
-                            var updatedCallState = self.callStates[callCid]
-                            updatedCallState?.participantResponses[memberId] = "missed"
-                            if let updatedCallState = updatedCallState {
-                                self.callStates[callCid] = updatedCallState
-                            }
-                        }
-
-                        // Notify listeners
-                        await MainActor.run {
-                            self.updateCallStatusAndNotify(callId: callCid, state: "missed", userId: memberId)
-                        }
-                    }
-                }
-
-                // End the call
-                if let call = streamVideo?.state.activeCall, call.cId == callCid {
-                    call.leave()
-                }
-
-                // Clean up timer on main thread
-                await MainActor.run {
-                    self.callStates[callCid]?.timer?.invalidate()
-                    var updatedCallState = self.callStates[callCid]
-                    updatedCallState?.timer = nil
-                    if let updatedCallState = updatedCallState {
-                        self.callStates[callCid] = updatedCallState
-                    }
-
-                    // Remove from callStates
-                    self.callStates.removeValue(forKey: callCid)
-                }
-
-                // Update UI
-                await MainActor.run {
-                    // self.overlayViewModel?.updateCall(nil)
-                    self.overlayView?.isHidden = true
-                    self.webView?.isOpaque = true
-                    self.updateCallStatusAndNotify(callId: callCid, state: "ended", reason: "timeout")
-                }
-            }
-        }
-    }
-
-    private func checkAllParticipantsResponded(callCid: String) async {
-        // Get a local copy of the call state from the main thread
-        let callState: (members: [MemberResponse], participantResponses: [String: String], createdAt: Date, timer: Timer?)? = await MainActor.run {
-            return self.callStates[callCid]
-        }
-
-        guard let callState = callState else {
-            StreamCallPlugin.dualprint("Call state not found for cId: \(callCid)")
-            return
-        }
-
-        let totalParticipants = callState.members.count
-        let responseCount = callState.participantResponses.count
-
-        StreamCallPlugin.dualprint("Total participants: \(totalParticipants), Responses: \(responseCount)")
-
-        let allResponded = responseCount >= totalParticipants
-        let allRejectedOrMissed = allResponded &&
-            callState.participantResponses.values.allSatisfy { $0 == "rejected" || $0 == "missed" }
-
-        if allResponded && allRejectedOrMissed {
-            StreamCallPlugin.dualprint("All participants have rejected or missed the call")
-
-            // End the  call
-            if let call = streamVideo?.state.activeCall, call.cId == callCid {
-                call.leave()
-            }
-
-            // Clean up timer and remove from callStates on main thread
-            await MainActor.run {
-                // Clean up timer
-                self.callStates[callCid]?.timer?.invalidate()
-
-                // Remove from callStates
-                self.callStates.removeValue(forKey: callCid)
-
-                // self.overlayViewModel?.updateCall(nil)
-                self.overlayView?.isHidden = true
-                self.webView?.isOpaque = true
-                self.updateCallStatusAndNotify(callId: callCid, state: "ended", reason: "all_rejected_or_missed")
-            }
-        }
-    }
-
     @objc func login(_ call: CAPPluginCall) {
         guard let token = call.getString("token"),
               let userId = call.getString("userId"),
@@ -554,30 +400,26 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
 
             Task {
                 do {
-                    StreamCallPlugin.dualprint("Creating call:")
-                    StreamCallPlugin.dualprint("- Call ID: \(callId)")
-                    StreamCallPlugin.dualprint("- Call Type: \(callType)")
-                    StreamCallPlugin.dualprint("- Users: \(members)")
-                    StreamCallPlugin.dualprint("- Should Ring: \(shouldRing)")
-                    StreamCallPlugin.dualprint("- Team: \(team)")
+                    print("Creating call:")
+                    print("- Call ID: \(callId)")
+                    print("- Call Type: \(callType)")
+                    print("- Users: \(members)")
+                    print("- Should Ring: \(shouldRing)")
+                    print("- Team: \(team)")
 
-                    // Create the call object
-                    let streamCall = streamVideo?.call(callType: callType, callId: callId)
-
-                    // Start the call with the members
-                    StreamCallPlugin.dualprint("Creating call with members...")
-                    try await streamCall?.create(
-                        memberIds: members,
-                        custom: [:],
-                        team: team, ring: shouldRing
-                    )
 
-                    // Join the call
-                    StreamCallPlugin.dualprint("Joining call...")
-                    try await streamCall?.join(create: false)
-                    StreamCallPlugin.dualprint("Successfully joined call")
 
                     // Update the CallOverlayView with the active call
+                    // Create the call object
+                    await self.callViewModel?.startCall(
+                        callType: callType,
+                        callId: callId,
+                        members: members.map { Member(userId: $0, role: nil, customData: [:], updatedAt: nil) },
+                        ring: shouldRing
+                    )
+                    
+                    
+                    // Update UI on main thread
                     await MainActor.run {
                         // self.overlayViewModel?.updateCall(streamCall)
                         self.overlayView?.isHidden = false
@@ -586,7 +428,8 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
 
                     call.resolve([
                         "success": true
-                    ])
+                    ])  
+
                 } catch {
                     log.error("Error making call: \(String(describing: error))")
                     call.reject("Failed to make call: \(error.localizedDescription)")
@@ -705,14 +548,14 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
                     }
 
                     // Join the call
-                    StreamCallPlugin.dualprint("Accepting and joining call \(streamCall!.cId)...")
+                    print("Accepting and joining call \(streamCall!.cId)...")
                     guard case .incoming(let incomingCall) = await self.callViewModel?.callingState else {
                         call.reject("Failed to accept call as there is no call ID")
                         return
                     }
 
                     await self.callViewModel?.acceptCall(callType: incomingCall.type, callId: incomingCall.id)
-                    StreamCallPlugin.dualprint("Successfully joined call")
+                    print("Successfully joined call")
 
                     // Update the CallOverlayView with the active call
                     await MainActor.run {
@@ -736,18 +579,18 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func initializeStreamVideo() {
         if (state == .initialized) {
-            StreamCallPlugin.dualprint("initializeStreamVideo already initialized")
+            print("initializeStreamVideo already initialized")
             // Try to get user credentials from repository
             guard let savedCredentials = SecureUserRepository.shared.loadCurrentUser() else {
-                StreamCallPlugin.dualprint("Save credentials not found, skipping initialization")
+                print("Save credentials not found, skipping initialization")
                 return
             }
             if (savedCredentials.user.id == streamVideo?.user.id) {
-                StreamCallPlugin.dualprint("Skipping initializeStreamVideo as user is already logged in")
+                print("Skipping initializeStreamVideo as user is already logged in")
                 return
             }
         } else if (state == .initializing) {
-            StreamCallPlugin.dualprint("initializeStreamVideo rejected - already initializing")
+            print("initializeStreamVideo rejected - already initializing")
             return
         }
         state = .initializing
@@ -755,11 +598,11 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         // Try to get user credentials from repository
         guard let savedCredentials = SecureUserRepository.shared.loadCurrentUser(),
               let apiKey = self.apiKey else {
-            StreamCallPlugin.dualprint("No saved credentials or API key found, skipping initialization")
+            print("No saved credentials or API key found, skipping initialization")
             state = .notInitialized
             return
         }
-        StreamCallPlugin.dualprint("Initializing with saved credentials for user: \(savedCredentials.user.name)")
+        print("Initializing with saved credentials for user: \(savedCredentials.user.name)")
 
         LogConfig.level = .debug
         self.streamVideo = StreamVideo(
@@ -768,7 +611,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             token: UserToken(stringLiteral: savedCredentials.tokenValue),
             tokenProvider: {completion in
                 guard let savedCredentials = SecureUserRepository.shared.loadCurrentUser() else {
-                    StreamCallPlugin.dualprint("No saved credentials or API key found, cannot refresh token")
+                    print("No saved credentials or API key found, cannot refresh token")
                     
                     completion(.failure(NSError(domain: "No saved credentials or API key found, cannot refresh token", code: 0, userInfo: nil)))
                     return
@@ -861,7 +704,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         
         // Check if we already have an overlay view - do nothing if it exists
         if let existingOverlayView = self.overlayView, existingOverlayView.superview != nil {
-            StreamCallPlugin.dualprint("Call overlay view already exists, making it visible")
+            print("Call overlay view already exists, making it visible")
             existingOverlayView.isHidden = false
             // Make webview transparent to see StreamCall UI underneath
             webView.isOpaque = false
@@ -870,7 +713,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
         
-        StreamCallPlugin.dualprint("Creating new call overlay view")
+        print("Creating new call overlay view")
         
         // First, create the overlay view
         let overlayView = UIHostingController(rootView: CallOverlayView(viewModel: callOverlayView))
@@ -923,7 +766,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
     private func ensureViewRemoved() {
         // Check if we have an overlay view
         if let existingOverlayView = self.overlayView {
-            StreamCallPlugin.dualprint("Hiding call overlay view")
+            print("Hiding call overlay view")
             
             // Hide the view instead of removing it
             existingOverlayView.isHidden = true
@@ -933,7 +776,7 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
             self.webView?.backgroundColor = nil
             self.webView?.scrollView.backgroundColor = nil
         } else {
-            StreamCallPlugin.dualprint("No call overlay view to hide")
+            print("No call overlay view to hide")
         }
     }
 

package/package.json

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