omikit-plugin 3.3.12 → 3.3.15

package/android/build.gradle

@@ -122,7 +122,7 @@ dependencies {
   implementation("androidx.work:work-runtime:2.8.1")
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
   // api 'vn.vihat.omicall:omi-sdk:2.3.23'
-  api "io.omicrm.vihat:omi-sdk:2.3.92"
+  api "io.omicrm.vihat:omi-sdk:2.3.94"
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

package/android/src/main/java/com/omikitplugin/OmikitPluginModule.kt

@@ -119,10 +119,60 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   private var isIncoming: Boolean = false
   private var isAnswerCall: Boolean = false
   private var permissionPromise: Promise? = null
+  
+  // Call state management to prevent concurrent calls
+  private var isCallInProgress: Boolean = false
+  private var lastCallTime: Long = 0
+  private val callCooldownMs: Long = 2000 // 2 seconds cooldown between calls
+  private val callStateLock = Any()
 
   override fun getName(): String {
     return NAME
   }
+  
+  /**
+   * Check if we can start a new call (no concurrent calls, cooldown passed)
+   */
+  private fun canStartNewCall(): Boolean {
+    synchronized(callStateLock) {
+      val currentTime = System.currentTimeMillis()
+      val timeSinceLastCall = currentTime - lastCallTime
+      
+      // Check if call is in progress or cooldown not passed
+      if (isCallInProgress) {
+        Log.d("OMISDK", "🚫 Call blocked: Call already in progress")
+        return false
+      }
+      
+      if (timeSinceLastCall < callCooldownMs) {
+        Log.d("OMISDK", "🚫 Call blocked: Cooldown period (${callCooldownMs - timeSinceLastCall}ms remaining)")
+        return false
+      }
+      
+      return true
+    }
+  }
+  
+  /**
+   * Mark call as started
+   */
+  private fun markCallStarted() {
+    synchronized(callStateLock) {
+      isCallInProgress = true
+      lastCallTime = System.currentTimeMillis()
+      Log.d("OMISDK", "📞 Call started, marking in progress")
+    }
+  }
+  
+  /**
+   * Mark call as ended
+   */
+  private fun markCallEnded() {
+    synchronized(callStateLock) {
+      isCallInProgress = false
+      Log.d("OMISDK", "📴 Call ended, clearing in progress flag")
+    }
+  }
 
 
     private val handler = Handler(Looper.getMainLooper())
@@ -184,6 +234,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       // Reset call state variables
       isIncoming = false
       isAnswerCall = false
+      // Clear call progress state when remote party ends call
+      markCallEnded()
       Log.d("OMISDK", "=>> onCallEnd AFTER RESET - isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
 
       // Kiểm tra kiểu dữ liệu trước khi ép kiểu để tránh lỗi
@@ -710,15 +762,14 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   fun initCallWithApiKey(data: ReadableMap, promise: Promise) {
     mainScope.launch {
       var loginResult = false
-      val usrName = data.getString("fullName")
-      val usrUuid = data.getString("usrUuid")
-      val apiKey = data.getString("apiKey")
+      val usrName = data.getString("fullName") ?: ""
+      val usrUuid = data.getString("usrUuid")  ?: ""
+      val apiKey = data.getString("apiKey") ?: ""
       val isVideo = data.getBoolean("isVideo") ?: false
       val phone = data.getString("phone")
-      val firebaseToken = data.getString("fcmToken") as String
+      val firebaseToken = data.getString("fcmToken") ?: ""
       val projectId = data.getString("projectId") ?: ""
 
-      requestPermission(isVideo)
       withContext(Dispatchers.Default) {
         try {
           // Validate required parameters
@@ -742,10 +793,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           loginResult = OmiClient.registerWithApiKey(
             apiKey ?: "",
             usrName ?: "",
-            phone ?: "",
             usrUuid ?: "",
+            phone ?: "",
             isVideo,
-            firebaseToken
+            firebaseToken,
+            projectId
           )
           
           if (loginResult) {
@@ -868,39 +920,22 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         reactApplicationContext!!,
         Manifest.permission.RECORD_AUDIO
       )
+    Log.d("OMISDK", "📤 Start Call With UUID")
     val map: WritableMap = WritableNativeMap()
     if (audio == PackageManager.PERMISSION_GRANTED) {
       mainScope.launch {
-        var callResult: OmiStartCallStatus? = null
-        try {
-          val uuid = data.getString("usrUuid") as String
-          val isVideo = data.getBoolean("isVideo")
-          
-          // Check if OmiClient instance and service are ready before making call
-          val omiClient = OmiClient.getInstance(reactApplicationContext!!)
-          if (omiClient == null) {
-            callResult = null
-          } else {
-            // Add small delay to ensure service is fully initialized
-            kotlinx.coroutines.delay(100)
-            
-            // Call on main thread to avoid PJSIP thread registration issues
-            callResult = omiClient.startCallWithUuid(uuid = uuid, isVideo = isVideo)
-          }
-        } catch (e: IllegalStateException) {
-          // Handle service not ready state
-          callResult = null
-        } catch (e: NullPointerException) {
-          // Handle null pointer exceptions
-          callResult = null
-        } catch (e: Throwable) {
-          // Handle any other exceptions including PJSIP thread issues
-          callResult = null
+        val uuid = data.getString("usrUuid") ?: ""
+        val isVideo = data.getBoolean("isVideo") ?: false;
+        
+        val startCallResult =
+          OmiClient.getInstance(reactApplicationContext!!).startCallWithUuid(uuid, isVideo)
+        var statusCalltemp = startCallResult.value as Int;
+        if (startCallResult.value == 200 || startCallResult.value == 407) {
+          statusCalltemp = 8
         }
-        var statusCalltemp = callResult?.ordinal ?: 8
         map.putInt("status", statusCalltemp)
         map.putString("_id", "")
-        map.putString("message", messageCall(statusCalltemp) as String)
+        map.putString("message", messageCall(startCallResult.value) as String)
         promise.resolve(map)
       }
     } else {
@@ -911,6 +946,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
+
   @ReactMethod
   fun joinCall(promise: Promise) {
       val appContext = reactApplicationContext.applicationContext
@@ -945,6 +981,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         omiClient.hangUp()
       }
     }
+    // Clear call state when ending call
+    markCallEnded()
     promise.resolve(true)
   }
 
@@ -962,6 +1000,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
                   omiClient.hangUp()
               }
           }
+          // Clear call state when rejecting call
+          markCallEnded()
           promise.resolve(true)
       } else {
           Log.d("OMISDK", "📤 Not incoming call, skipping reject")
@@ -978,6 +1018,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         omiClient.hangUp()
       }
     }
+    // Clear call state when dropping call
+    markCallEnded()
     promise.resolve(true)
   }
 

package/ios/CallProcess/CallManager.swift

@@ -490,13 +490,26 @@ func startCall(_ phoneNumber: String, isVideo: Bool, completion: @escaping (_: S
           if let jsonString = OmiUtils.convertDictionaryToJson(dictionary: dataToSend) {
             completion(jsonString)
           } else {
-            completion("Conversion to JSON failed")
+             completion("{\"status\": \"error\", \"message\": \"JSON conversion failed\"}")
           }
           return
           
         }
       
       return
+    } else {
+       var dataToSend: [String: Any] = [
+            "status": 0,
+            "_id": "",
+            "message": "INVALID_UUID",
+            "message_detail": "UUID does not exist"
+          ]
+          if let jsonString = OmiUtils.convertDictionaryToJson(dictionary: dataToSend) {
+            completion(jsonString)
+          } else {
+           completion("{\"status\": \"error\", \"message\": \"JSON conversion failed\"}")
+          }
+          return
     }
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omikit-plugin",
-  "version": "3.3.12",
+  "version": "3.3.15",
   "description": "Omikit Plugin by ViHAT",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",