omikit-plugin 3.2.88 → 3.2.90

package/android/build.gradle

@@ -121,7 +121,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.70"
+  api "io.omicrm.vihat:omi-sdk:2.3.71"
 
   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

@@ -42,7 +42,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   ReactContextBaseJavaModule(reactContext), ActivityEventListener, OmiListener {
   private val mainScope = CoroutineScope(Dispatchers.Main)
   private var isIncoming: Boolean = false
-  private var isAnserCall: Boolean = false
+  private var isAnswerCall: Boolean = false
 
   override fun getName(): String {
     return NAME
@@ -52,7 +52,10 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     private val handler = Handler(Looper.getMainLooper())
 
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
+    Log.d("OMISDK", "=>> incomingReceived CALLED - BEFORE: isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
     isIncoming = true;
+    isAnswerCall = false; // Reset answer state for new incoming call
+    Log.d("OMISDK", "=>> incomingReceived AFTER SET - isIncoming: $isIncoming, isAnswerCall: $isAnswerCall, phoneNumber: $phoneNumber")
 
     val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
 
@@ -75,7 +78,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       startTime: Long,
       transactionId: String?,
   ) {
-      isAnserCall = true
+      isAnswerCall = true
       Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
 
       Handler(Looper.getMainLooper()).postDelayed({
@@ -99,7 +102,13 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
-      Log.d("OMISDK RN", "=>> onCallEnd 0000 => $callInfo")
+      Log.d("OMISDK RN", "=>> onCallEnd CALLED - BEFORE RESET: isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
+      Log.d("OMISDK RN", "=>> onCallEnd callInfo => $callInfo")
+
+      // Reset call state variables
+      isIncoming = false
+      isAnswerCall = false
+      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
       val call = callInfo ?: mutableMapOf()
@@ -157,6 +166,18 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val prePhoneNumber = OmiClient.prePhoneNumber ?: ""
       val typeNumber = OmiKitUtils().checkTypeNumber(prePhoneNumber)
 
+      Log.d("OMISDK", "=>> onRinging CALLED - BEFORE: isIncoming: $isIncoming, isAnswerCall: $isAnswerCall, callDirection: $callDirection")
+
+      if (callDirection == "inbound") {
+        isIncoming = true;
+        Log.d("OMISDK", "=>> onRinging SET isIncoming = true for inbound call")
+      } else if (callDirection == "outbound") {
+        isIncoming = false;
+        Log.d("OMISDK", "=>> onRinging SET isIncoming = false for outbound call")
+      }
+
+      Log.d("OMISDK", "=>> onRinging AFTER: isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
+
       // ✅ Sử dụng safe WritableMap creation
       val eventData = mapOf(
           "callerNumber" to if (callDirection == "inbound") prePhoneNumber else "",
@@ -201,7 +222,12 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
-      Log.d("OMISDK", "=>> ON OUTGOING STARTED CALL => ")
+      Log.d("OMISDK", "=>> onOutgoingStarted CALLED - BEFORE: isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
+      
+      // For outgoing calls, set states appropriately
+      isIncoming = false;
+      isAnswerCall = false;
+      Log.d("OMISDK", "=>> onOutgoingStarted AFTER SET - isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
 
       val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
 
@@ -211,7 +237,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           putString("transactionId", "")
           putInt("status", CallState.calling.value)
           putString("_id", "")
-          putBoolean("incoming", isIncoming) // 🔹 Kiểm tra lỗi chính tả của biến này
+          putBoolean("incoming", isIncoming)
           putString("typeNumber", typeNumber)
       }
 
@@ -422,6 +448,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
+  @Suppress("MissingPermission")
   private fun isNetworkAvailable(): Boolean {
     return try {
       val connectivityManager = reactApplicationContext?.getSystemService(android.content.Context.CONNECTIVITY_SERVICE) as? android.net.ConnectivityManager
@@ -805,7 +832,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun endCall(promise: Promise) {
-    if (isIncoming && !isAnserCall) {
+    if (isIncoming && !isAnswerCall) {
       OmiClient.getInstance(reactApplicationContext!!).decline()
     } else {
       OmiClient.getInstance(reactApplicationContext!!).hangUp()
@@ -813,17 +840,30 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     promise.resolve(true)
   }
 
-  @ReactMethod
+ @ReactMethod
   fun rejectCall(promise: Promise) {
-    if (isIncoming && !isAnserCall) {
-      OmiClient.getInstance(reactApplicationContext!!).declineWithCode(true) // 486
-    }
-    promise.resolve(true)
+      Log.d("OMISDK", "➡️ rejectCall called - isIncoming: $isIncoming, isAnswerCall: $isAnswerCall")
+      if (isIncoming) {
+          Log.d("OMISDK", "📞 Incoming call")
+
+          if (!isAnswerCall) {
+              Log.d("OMISDK", "🚫 Declining call with declineWithCode(true)")
+              OmiClient.getInstance(reactApplicationContext!!).declineWithCode(true) // 486 Busy Here
+          } else {
+              Log.d("OMISDK", "📴 Call already answered, hanging up")
+              OmiClient.getInstance(reactApplicationContext!!).hangUp()
+          }
+
+          promise.resolve(true)
+      } else {
+          Log.d("OMISDK", "📤 Not incoming call, skipping reject")
+          promise.resolve(false)
+      }
   }
 
   @ReactMethod
   fun dropCall(promise: Promise) {
-    if (isIncoming && !isAnserCall) {
+    if (isIncoming && !isAnswerCall) {
       OmiClient.getInstance(reactApplicationContext!!).declineWithCode(false) // 603
     } else {
       OmiClient.getInstance(reactApplicationContext!!).hangUp()

package/omikit-plugin.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   # Thêm dependency bắt buộc
   s.dependency "React-Core"
   # Sử dụng version OmiKit ổn định hơn
-  s.dependency "OmiKit", "1.8.38"
+  s.dependency "OmiKit", "1.8.40"
 
 
   s.requires_arc = true

package/package.json

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