feat: added registered call check on turbomodule side

Author: greenfrvr

packages/react-native-callingx/android/src/main/java/com/callingx/CallService.kt

@@ -1,19 +1,3 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.callingx
 
 import CallRepository
@@ -26,7 +10,6 @@ import android.os.Bundle
 import android.os.IBinder
 import android.telecom.DisconnectCause
 import android.util.Log
-import androidx.annotation.RequiresApi
 import com.callingx.model.Call
 import com.callingx.model.CallAction
 import com.callingx.notifications.CallNotificationManager
@@ -270,6 +253,11 @@ class CallService : Service(), CallRepository.Listener {
         }
     }
 
+    fun isCallRegistered(callId: String): Boolean {
+        val currentCall = callRepository.currentCall.value
+        return currentCall is Call.Registered && currentCall.id == callId
+    }
+
     public fun processAction(action: CallAction) {
         Log.d(TAG, "[service] processAction: Processing action: ${action::class.simpleName}")
         val currentCall = callRepository.currentCall.value

packages/react-native-callingx/android/src/main/java/com/callingx/CallingxModule.kt

@@ -12,6 +12,7 @@ import android.os.IBinder
 import android.telecom.DisconnectCause
 import android.util.Log
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.callingx.model.CallAction
 import com.callingx.notifications.NotificationChannelsManager
 import com.callingx.notifications.NotificationsConfig
@@ -25,7 +26,6 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import androidx.core.net.toUri
 
 @ReactModule(name = CallingxModule.NAME)
 class CallingxModule(reactContext: ReactApplicationContext) : NativeCallingxSpec(reactContext) {
@@ -252,6 +252,11 @@ class CallingxModule(reactContext: ReactApplicationContext) : NativeCallingxSpec
         executeServiceAction(action, promise)
     }
 
+    override fun isCallRegistered(callId: String): Boolean {
+        Log.d(TAG, "[module] isCallRegistered: Checking if call is registered: $callId")
+        return callService?.isCallRegistered(callId) ?: false
+    }
+
     override fun setMutedCall(callId: String, isMuted: Boolean, promise: Promise) {
         Log.d(TAG, "[module] setMutedCall: Setting muted call: $callId, $isMuted")
         val action = CallAction.ToggleMute(isMuted)
@@ -475,6 +480,11 @@ class CallingxModule(reactContext: ReactApplicationContext) : NativeCallingxSpec
             val action = intent.action
             val callId = intent.getStringExtra(EXTRA_CALL_ID)
 
+            Log.d(
+                    TAG,
+                    "[module] onReceive: Received intent: $action callId: $callId callService: ${callService != null}"
+            )
+
             if (action == SERVICE_READY_ACTION) {
                 Log.d(TAG, "[module] onReceive: Service is ready, initiating binding")
                 bindToServiceIfNeeded()
@@ -486,10 +496,6 @@ class CallingxModule(reactContext: ReactApplicationContext) : NativeCallingxSpec
                 return
             }
 
-            Log.d(
-                    TAG,
-                    "[module] onReceive: Received intent: $action callId: $callId callService: ${callService != null}"
-            )
             val params = Arguments.createMap()
             if (callId != null) {
                 params.putString("callId", callId)

packages/react-native-callingx/android/src/main/java/com/callingx/notifications/NotificationsConfig.kt

@@ -118,7 +118,7 @@ object NotificationsConfig {
       id = channel.getString("id") ?: "",
       name = channel.getString("name") ?: "",
       sound = channel.getString("sound"),
-      vibration = channel.getBoolean("vibration"),
+      vibration = channel.hasKey("vibration") && channel.getBoolean("vibration") ?: false,
       importance = importance,
     )
   }

packages/react-native-callingx/ios/Callingx.mm

@@ -355,6 +355,8 @@ + (void)endCall:(NSString *)callId reason:(int)reason {
   default:
     break;
   }
+
+  [uuidStorage removeCid:callId];
 }
 
 + (BOOL)requiresMainQueueSetup {
@@ -744,6 +746,20 @@ - (void)endCall:(nonnull NSString *)callId
   resolve(@YES);
 }
 
+- (NSNumber *)isCallRegistered:(nonnull NSString *)callId {
+  NSUUID *uuid = [uuidStorage getUUIDForCid:callId];
+  if (uuid == nil) return @NO;
+  
+  CXCallObserver *observer = [[CXCallObserver alloc] init];
+  for (CXCall *call in observer.calls) {
+    if ([call.UUID isEqual:uuid]) {
+      return @YES;
+    }
+  }
+
+  return @NO;
+}
+
 - (void)setCurrentCallActive:(nonnull NSString *)callId
                      resolve:(nonnull RCTPromiseResolveBlock)resolve
                       reject:(nonnull RCTPromiseRejectBlock)reject {

packages/react-native-callingx/src/CallingxModule.ts

@@ -184,6 +184,10 @@ class CallingxModule implements ICallingxModule {
     return NativeCallingModule.endCallWithReason(callId, reasons[reason]);
   }
 
+  isCallRegistered(callId: string): boolean {
+    return NativeCallingModule.isCallRegistered(callId);
+  }
+
   setMutedCall(callId: string, isMuted: boolean): Promise<void> {
     return NativeCallingModule.setMutedCall(callId, isMuted);
   }

packages/react-native-callingx/src/spec/NativeCallingx.ts

@@ -76,6 +76,8 @@ export interface Spec extends TurboModule {
     }
   ): Promise<void>;
 
+  isCallRegistered(callId: string): boolean;
+
   endCallWithReason(callId: string, reason: number): Promise<void>;
 
   endCall(callId: string): Promise<void>;

packages/react-native-callingx/src/types.ts

@@ -39,6 +39,8 @@ export interface ICallingxModule {
     displayOptions?: InfoDisplayOptions
   ): Promise<void>;
 
+  isCallRegistered(callId: string): boolean;
+
   endCallWithReason(callId: string, reason: EndCallReason): Promise<void>;
 
   setMutedCall(callId: string, isMuted: boolean): Promise<void>;

packages/react-native-sdk/src/hooks/push/useCallingExpWithCallingStateEffect.ts

@@ -5,7 +5,6 @@ import {
 } from '@stream-io/video-client';
 import { useCall, useCallStateHooks } from '@stream-io/video-react-bindings';
 import { useEffect, useRef } from 'react';
-import { voipPushNotificationCallCId$ } from '../../utils/push/internal/rxSubjects';
 import { getCallingxLibIfAvailable } from '../../utils/push/libs/callingx';
 
 //calling state methods are not exhaustive, so we need to add more methods to cover all the cases
@@ -40,53 +39,40 @@ export const useCallingExpWithCallingStateEffect = () => {
   useEffect(() => {
     return () => {
       const callingx = getCallingxLibIfAvailable();
-      if (!callingx) {
+      if (!callingx || !activeCallCid) {
         return;
       }
-      //as an alternative think about method which will return CallKit/Telecom state for given cid
-      const incomingCallCid = RxUtils.getCurrentValue(
-        voipPushNotificationCallCId$,
-      );
-      if (
-        !activeCallCid ||
-        !incomingCallCid ||
-        incomingCallCid !== activeCallCid
-      ) {
+
+      const isCallRegistered = callingx.isCallRegistered(activeCallCid);
+      if (!isCallRegistered) {
         logger.debug(
-          `No active call cid to end in calling exp: ${activeCallCid} incomingCallCid: ${incomingCallCid}`,
+          `No active call cid to end in calling exp: ${activeCallCid} isCallRegistered: ${isCallRegistered}`,
         );
         return;
       }
       //if incoming stream call was unmounted, we need to end the call in CallKit/Telecom
       //TODO: think about sending appropriate reason for end call
+      logger.debug(`Ending call in calling exp: ${activeCallCid}`);
       callingx.endCallWithReason(activeCallCid, 'local');
-      voipPushNotificationCallCId$.next(undefined);
     };
   }, [activeCallCid]);
 
   useEffect(() => {
     const callingx = getCallingxLibIfAvailable();
-    if (!callingx) {
+    if (!callingx || !activeCallCid) {
       return;
     }
 
-    //as an alternative think about method which will return CallKit/Telecom state for given cid
-    const incomingCallCid = RxUtils.getCurrentValue(
-      voipPushNotificationCallCId$,
-    );
-    if (
-      !incomingCallCid ||
-      !activeCallCid ||
-      incomingCallCid !== activeCallCid
-    ) {
+    const isCallRegistered = callingx.isCallRegistered(activeCallCid);
+    if (!isCallRegistered) {
       logger.debug(
-        `No active call cid to end in calling exp: ${activeCallCid} incomingCallCid: ${incomingCallCid}`,
+        `No active call cid to end in calling exp: ${activeCallCid} isCallRegistered: ${isCallRegistered}`,
       );
       return;
     }
 
     logger.debug(
-      `useEffect: ${activeCallCid} incomingCallCid: ${incomingCallCid}`,
+      `useEffect: ${activeCallCid} isCallRegistered: ${isCallRegistered}`,
     );
     logger.debug(
       `prevState.current: ${prevState.current}, current callingState: ${callingState}`,
@@ -99,7 +85,7 @@ export const useCallingExpWithCallingStateEffect = () => {
       ) {
         //in case call was registered as incoming and state changed to joined, we need to answer the call
         logger.debug(
-          `Should accept call in callkeep: ${activeCallCid} callCid: ${incomingCallCid}`,
+          `Should accept call in callkeep: ${activeCallCid} isCallRegistered: ${isCallRegistered}`,
         );
         callingx.answerIncomingCall(activeCallCid);
       } else if (
@@ -110,7 +96,6 @@ export const useCallingExpWithCallingStateEffect = () => {
         logger.debug(`Should end call in callkeep: ${activeCallCid}`);
         //TODO: think about sending appropriate reason for end call
         callingx.endCallWithReason(activeCallCid, 'local');
-        voipPushNotificationCallCId$.next(undefined);
       }
     }
 
@@ -119,21 +104,14 @@ export const useCallingExpWithCallingStateEffect = () => {
 
   useEffect(() => {
     const callingx = getCallingxLibIfAvailable();
-    if (!callingx) {
+    if (!callingx || !activeCallCid) {
       return;
     }
 
-    //for now supports only incoming calls
-    const incomingCallCid = RxUtils.getCurrentValue(
-      voipPushNotificationCallCId$,
-    );
-    if (
-      !incomingCallCid ||
-      !activeCallCid ||
-      incomingCallCid !== activeCallCid
-    ) {
+    const isCallRegistered = callingx.isCallRegistered(activeCallCid);
+    if (!isCallRegistered) {
       logger.debug(
-        `No active call cid to set muted in calling exp: ${activeCallCid} incomingCallCid: ${incomingCallCid}`,
+        `No active call cid to set muted in calling exp: ${activeCallCid} isCallRegistered: ${isCallRegistered}`,
       );
       return;
     }

packages/react-native-sdk/src/utils/push/android.ts

@@ -1,6 +1,5 @@
 import {
   CallingState,
-  RxUtils,
   StreamVideoClient,
   videoLoggerSystem,
 } from '@stream-io/video-client';
@@ -18,10 +17,7 @@ import {
   getNotifeeLibThrowIfNotInstalledForPush,
   type NotifeeLib,
 } from './libs';
-import {
-  pushNonRingingCallData$,
-  voipPushNotificationCallCId$,
-} from './internal/rxSubjects';
+import { pushNonRingingCallData$ } from './internal/rxSubjects';
 import { pushUnsubscriptionCallbacks } from './internal/constants';
 import { canListenToWS, shouldCallBeClosed } from './internal/utils';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
@@ -151,14 +147,15 @@ export const firebaseDataHandler = async (
       return;
     }
 
-    if (RxUtils.getCurrentValue(voipPushNotificationCallCId$)) {
+    const callingx = getCallingxLib();
+
+    if (callingx.isCallRegistered(call_cid)) {
       logger.debug(
         `call.ring notification already processed, skipping the call.ring notification`,
       );
       return;
     }
 
-    const callingx = getCallingxLib();
     await callingx.checkPermissions();
     if (!callingx.canPostNotifications()) {
       logger.debug(
@@ -190,7 +187,6 @@ export const firebaseDataHandler = async (
     logger.debug(
       `Displaying incoming call notification with callCid: ${call_cid} asForegroundService: ${asForegroundService}`,
     );
-    voipPushNotificationCallCId$.next(call_cid);
 
     if (asForegroundService) {
       // Listen to call events from WS through fg service
@@ -223,7 +219,6 @@ export const firebaseDataHandler = async (
               `Ending call with callCid: ${call_cid} shouldCallBeClosed`,
               'debug',
             );
-            voipPushNotificationCallCId$.next(undefined);
             //TODO: think about sending appropriate reason for end call
             callingx.endCallWithReason(call_cid, 'remote');
             return;
@@ -251,7 +246,6 @@ export const firebaseDataHandler = async (
               );
               unsubscribeFunctions.forEach((fn) => fn());
 
-              voipPushNotificationCallCId$.next(undefined);
               finishBackgroundTask();
               //TODO: think about sending appropriate reason for end call
               callingx.endCallWithReason(call_cid, 'rejected');
@@ -275,7 +269,6 @@ export const firebaseDataHandler = async (
                   `Ending call with callCid: ${call_cid} callingState: ${callingState}`,
                   'debug',
                 );
-                voipPushNotificationCallCId$.next(undefined);
                 finishBackgroundTask();
                 callingx.endCallWithReason(call_cid, 'remote');
               }
@@ -297,7 +290,6 @@ export const firebaseDataHandler = async (
                   `Ending call with callCid: ${call_cid} callId: ${callId}`,
                   'debug',
                 );
-                voipPushNotificationCallCId$.next(undefined);
                 finishBackgroundTask();
                 callingx.endCallWithReason(callId, 'rejected');
               }

packages/react-native-sdk/src/utils/push/internal/ios.ts

@@ -1,10 +1,9 @@
 import { NativeModules, Platform } from 'react-native';
 import { getVoipPushNotificationLib } from '../libs';
-import { voipPushNotificationCallCId$ } from './rxSubjects';
 import { pushUnsubscriptionCallbacks } from './constants';
 import { canListenToWS, shouldCallBeClosed } from './utils';
 import { StreamVideoConfig } from '../../StreamVideoRN/types';
-import { RxUtils, videoLoggerSystem } from '@stream-io/video-client';
+import { videoLoggerSystem } from '@stream-io/video-client';
 import { getCallingxLib } from '../libs/callingx';
 
 export const onVoipNotificationReceived = async (
@@ -46,7 +45,8 @@ export const onVoipNotificationReceived = async (
     return;
   }
 
-  if (RxUtils.getCurrentValue(voipPushNotificationCallCId$)) {
+  const callingx = getCallingxLib();
+  if (callingx.isCallRegistered(call_cid)) {
     logger.debug(
       `call.ring notification already processed, skipping the call.ring notification`,
     );
@@ -74,7 +74,6 @@ export const onVoipNotificationReceived = async (
     if (mustEndCall) {
       logger.debug(`callkeep.reportEndCallWithUUID for call_cid: ${call_cid}`);
       //TODO: think about sending appropriate reason for end call
-      const callingx = getCallingxLib();
       callingx.endCallWithReason(call_cid, 'remote');
 
       const voipPushNotification = getVoipPushNotificationLib();
@@ -115,5 +114,4 @@ export const onVoipNotificationReceived = async (
   logger.debug(
     `call_cid:${call_cid} received and processed from call.ring push notification`,
   );
-  voipPushNotificationCallCId$.next(call_cid);
 };