omikit-plugin 3.2.70 → 3.2.72

package/README.md

@@ -591,7 +591,7 @@ startServices();
   - The `initCallWithApiKey()` function is usually used for your client, who only has a certain function, calling a fixed number. For example, you can only call your hotline number 
 
 ```javascript
-import { initCallWithApiKey } from 'omikit-plugin';
+import { initCallWithApiKey, getCurrentUser } from 'omikit-plugin';
 import messaging from '@react-native-firebase/messaging';
 
 let token: String;
@@ -617,7 +617,18 @@ const loginInfo = {
 // Initialize call functionality using the provided API key
 const result = await initCallWithApiKey(loginInfo);
 
-// If result is true, the user has successfully logged in.
+/* ❌ ❌ NOTE: Please check the user information again, if the object is not empty then you have successfully logged in. 
+Otherwise, if you have not successfully logged in, you should not navigate to the call screen. When startCall with empty information, it may crash your application or not be clear when receiving the startCall error  ❌❌*/
+
+// Example:
+
+if (result){
+  const infoUser = await getCurrentUser()
+  if (infoUser != null && Object.keys(infoUser).length > 0) { 
+    // ✅ Login OMI Success 
+    // Can navigate to call screen or start call 🚀 🚀
+  }
+}
  ```
 
 📌 **initCallWithUserPassword()**
@@ -628,7 +639,7 @@ const result = await initCallWithApiKey(loginInfo);
   - The `initCallWithUserPassword()` function is for employees. They can call any telecommunications number allowed in your business on the OMI system.
   
 ```javascript
-import { initCallWithUserPassword } from 'omikit-plugin';
+import { initCallWithUserPassword, getCurrentUser } from 'omikit-plugin';
 import messaging from '@react-native-firebase/messaging';
 
 let token: String;
@@ -652,7 +663,20 @@ const loginInfo = {
 
 // Initialize call functionality using username and password authentication
 const result = await initCallWithUserPassword(loginInfo);
-// If result is true, the user has successfully logged in.
+
+
+/* ❌ ❌ NOTE: Please check the user information again, if the object is not empty then you have successfully logged in. 
+Otherwise, if you have not successfully logged in, you should not navigate to the call screen. When startCall with empty information, it may crash your application or not be clear when receiving the startCall error  ❌❌*/
+
+// Example:
+
+if (result){
+  const infoUser = await getCurrentUser()
+  if (infoUser != null && Object.keys(infoUser).length > 0) { 
+    // ✅ Login OMI Success 
+    // Can navigate to call screen or start call 🚀 🚀
+  }
+}
 ```
 
 📌 **configPushNotification()**
@@ -909,7 +933,9 @@ const result = await startCallWithUuid({
 {
     "extension": "111",
     "full_name": "chau1",
+    "fullName": "chau1",
     "avatar_url": "",
+    "avatarUrl": "",
     "uuid": "122aaa"
 }
 ```
@@ -1060,6 +1086,20 @@ const result = await startCallWithUuid({
 ### 🚀🚀 Events listener 🚀🚀 
 
 ```javascript
+import { omiEmitter } from 'omikit-plugin';
+
+/*
+❌ ❌ With TypeScript, in android, it seems our omiEmitter is not working properly. Please use the following manual declaration, to ensure performance
+*/
+
+// 📌 For TypeScript, Android 
+import { NativeEventEmitter, NativeModules } from "react-native";
+const { OmikitPlugin } = NativeModules;
+const omiEmitter = new NativeEventEmitter(OmikitPlugin);
+
+
+
+
 useEffect(() => {
     omiEmitter.addListener(OmiCallEvent.onCallStateChanged, onCallStateChanged);
     omiEmitter.addListener(OmiCallEvent.onMuted, onMuted);
@@ -1129,24 +1169,27 @@ useEffect(() => {
 ```javascript
 // The event is updated every time the call status changes
 const onCallStateChanged = (data: any) => {
+// ⚠️ ⚠️  Currently, we support two data formats: camelCase and snake_case. Snake_case is used for data v1, while camelCase is for v2. We encourage customers to use camelCase instead of snake_case, as we plan to completely remove the snake_case format in the future ❌ ❌
+
   /*
     Call state change event data (Object) includes:
     
     - _id: string (UUID of the call)
     - callInfo: object (Detailed call information)
     - callerNumber: string (Phone number of the caller)
-    - code_end_call: number (Status code when the call ends)
-    - destination_number?: string (Destination phone number, optional)
+    - code_end_call, codeEndCall: number (Status code when the call ends)
+    - destination_number, destinationNumber?: string (Destination phone number, optional)
     - direction: string ("inbound" or "outbound", call direction)
     - disposition: string (Call answer status)
     - incoming: boolean (true if it is an incoming call)
     - isVideo: boolean (true if it is a video call)
-    - sip_user: string (Current SIP user)
-    - source_number: string (SIP number of the user)
+    - sip_user, sipUser: string (Current SIP user)
+    - source_number, sourceNumber: string (SIP number of the user)
     - status: string (value matching with List status call)
-    - time_end: number (Timestamp when the call ended)
-    - time_start_to_answer: number (Time taken to answer the call)
-    - transaction_id: string (OMI Call unique ID)
+    - time_end, timeEnd: number (Timestamp when the call ended)
+    - time_start_to_answer, timeStartToAnswer: number (Time taken to answer the call)
+    - transaction_id, transactionId: string (OMI Call unique ID)
+    - typeNumber: string ("", "internal", "phone", "zalo")
   */
 };
 
@@ -1180,7 +1223,7 @@ const onSwitchboardAnswer = (data: any) => {
 }
 ```
 
-✨ Table describing `code_end_call` status
+✨ Table describing `code_end_call, codeEndCall` status
 
 | Code            | Description                                                                                                           |
 | --------------- | --------------------------------------------------------------------------------------------------------------------- |

package/android/build.gradle

@@ -120,7 +120,7 @@ dependencies {
   // use for OMISDK
   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.19'
+  api 'vn.vihat.omicall:omi-sdk:2.3.22'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

package/android/gradle.properties

@@ -4,4 +4,4 @@ OmikitPlugin_targetSdkVersion=33
 OmikitPlugin_compileSdkVersion=33
 OmikitPlugin_ndkversion=21.4.7075529
 OMI_USER=omicall
-OMI_TOKEN=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
+OMI_TOKEN=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

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

@@ -24,6 +24,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.delay
 import vn.vihat.omicall.omisdk.OmiAccountListener
 import vn.vihat.omicall.omisdk.OmiClient
 import vn.vihat.omicall.omisdk.OmiListener
@@ -38,76 +39,105 @@ import vn.vihat.omicall.omisdk.utils.Utils
 class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   ReactContextBaseJavaModule(reactContext), ActivityEventListener, OmiListener {
   private val mainScope = CoroutineScope(Dispatchers.Main)
-  private var isIncomming: Boolean = false
+  private var isIncoming: Boolean = false
   private var isAnserCall: Boolean = false
 
   override fun getName(): String {
     return NAME
   }
 
+
+    private val handler = Handler(Looper.getMainLooper())
+
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
-    isIncomming = true;
+    isIncoming = true;
     Log.d("OMISDK", "=>> START INCOMING CALL REVICED => ")
-    val map: WritableMap = WritableNativeMap()
-    map.putBoolean("isVideo", isVideo ?: true)
-    map.putBoolean("incoming", isIncomming)
-    map.putString("callerNumber", phoneNumber)
-    map.putString("_id", "")
-    map.putInt("status", CallState.incoming.value)
+
+    val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+    val map: WritableMap = WritableNativeMap().apply {
+        putBoolean("isVideo", isVideo ?: true)
+        putBoolean("incoming", isIncoming)
+        putString("callerNumber", phoneNumber ?: "")
+        putString("_id", "")
+        putInt("status", CallState.incoming.value)
+        putString("typeNumber", typeNumber)
+    }
+
     sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onCallEstablished(
-    callerId: Int,
-    phoneNumber: String?,
-    isVideo: Boolean?,
-    startTime: Long,
-    transactionId: String?,
+      callerId: Int,
+      phoneNumber: String?,
+      isVideo: Boolean?,
+      startTime: Long,
+      transactionId: String?,
   ) {
-    isAnserCall = true
-    Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
-    Handler(Looper.getMainLooper()).postDelayed({
-      Log.d("OmikitReactNative", "onCallEstablished")
-      val map: WritableMap = WritableNativeMap()
-      map.putString("callerNumber", phoneNumber)
-      map.putBoolean("isVideo", isVideo ?: true)
-      map.putBoolean("incoming", isIncomming)
-      map.putString("transactionId", transactionId)
-      map.putInt("status", CallState.confirmed.value)
-      sendEvent(CALL_STATE_CHANGED, map)
-    }, 200)
+      isAnserCall = true
+      Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
+
+      Handler(Looper.getMainLooper()).postDelayed({
+          Log.d("OmikitReactNative", "onCallEstablished")
+
+          val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+          val map: WritableMap = WritableNativeMap().apply {
+              putString("callerNumber", phoneNumber ?: "")
+              putBoolean("isVideo", isVideo ?: true)
+              putBoolean("incoming", isIncoming) // 🔹 Kiểm tra lỗi chính tả biến này
+              putString("transactionId", transactionId ?: "")
+              putInt("status", CallState.confirmed.value)
+              putString("typeNumber", typeNumber)
+          }
+
+          sendEvent(CALL_STATE_CHANGED, map)
+      }, 200)
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
-    Log.d("OMISDK RN", "=>> onCallEnd 0000 => $callInfo")
-    val call = callInfo as Map<*, *>
-    val map: WritableMap = WritableNativeMap()
-    val timeStartToAnswer = call["time_start_to_answer"] as Long?
-    val timeEnd = call["time_end"] as Long
-    map.putString("transaction_id", call["transaction_id"] as String?)
-    map.putString("direction", call["direction"] as String)
-    map.putString("source_number", call["source_number"] as String)
-    map.putString("destination_number", call["destination_number"] as String)
-    map.putDouble("time_start_to_answer", (timeStartToAnswer ?: 0).toDouble())
-    map.putDouble("time_end", timeEnd.toDouble())
-    map.putString("sip_user", call["sip_user"] as String)
-    map.putString("disposition", call["disposition"] as String)
-    map.putInt("status", CallState.disconnected.value)
-    map.putInt("code_end_call", statusCode as Int)
-    Log.d("OMISDK RN", "=>> onCallEnd  => $map")
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK RN", "=>> onCallEnd 0000 => $callInfo")
+
+      // Kiểm tra kiểu dữ liệu trước khi ép kiểu để tránh lỗi
+      val call = callInfo ?: mutableMapOf()
+
+      val timeStartToAnswer = (call["time_start_to_answer"] as? Long) ?: 0L
+      val timeEnd = (call["time_end"] as? Long) ?: 0L
+      val phoneNumber = (call["destination_number"] as? String) ?: (call["source_number"] as? String) ?: ""
+      val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber)
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("direction", call["direction"] as? String ?: "")
+          putString("transactionId", call["transaction_id"] as? String ?: "")
+          putString("sourceNumber", call["source_number"] as? String ?: "")
+          putString("destinationNumber", call["destination_number"] as? String ?: "")
+          putDouble("timeStartToAnswer", timeStartToAnswer.toDouble())
+          putDouble("timeEnd", timeEnd.toDouble())
+          putString("sipUser", call["sip_user"] as? String ?: "")
+          putInt("codeEndCall", statusCode)
+          putString("disposition", call["disposition"] as? String ?: "")
+          putInt("status", CallState.disconnected.value)
+          putString("typeNumber", typeNumber)
+      }
+
+      Log.d("OMISDK RN", "=>> onCallEnd  => $map")
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onConnecting() {
-    Log.d("OMISDK", "=>> ON CONNECTING CALL => ")
-    val map: WritableMap = WritableNativeMap()
-    map.putString("callerNumber", "")
-    map.putBoolean("isVideo", NotificationService.isVideo)
-    map.putBoolean("incoming", isIncomming)
-    map.putString("transactionId", "")
-    map.putString("_id", "")
-    map.putInt("status", CallState.connecting.value)
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK", "=>> ON CONNECTING CALL => ")
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", "")
+          putBoolean("isVideo", NotificationService.isVideo)
+          putBoolean("incoming", isIncoming ?: false)
+          putString("transactionId", "")
+          putString("_id", "")
+          putInt("status", CallState.connecting.value)
+          putString("typeNumber", "")
+      }
+
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onDescriptionError() {
@@ -117,25 +147,21 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onRinging(callerId: Int, transactionId: String?) {
-    var callDirection = OmiClient.callDirection
-    val map: WritableMap = WritableNativeMap()
+      val callDirection = OmiClient.callDirection
+      val prePhoneNumber = OmiClient.prePhoneNumber ?: ""
+      val typeNumber = OmiKitUtils().checkTypeNumber(prePhoneNumber)
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", if (callDirection == "inbound") prePhoneNumber else "")
+          putBoolean("isVideo", NotificationService.isVideo)
+          putString("transactionId", transactionId ?: "")
+          putInt("status", if (callDirection == "inbound") CallState.incoming.value else CallState.early.value)
+          putBoolean("incoming", callDirection == "inbound")
+          putString("typeNumber", typeNumber)
+      }
 
-    if (callDirection == "inbound") {
-      Log.d("OMISDK", "=>> ON IN COMMING CALL => ")
-      map.putString("callerNumber", OmiClient.prePhoneNumber)
-      map.putBoolean("isVideo", NotificationService.isVideo)
-      map.putBoolean("incoming", true)
-      map.putString("transactionId", transactionId ?: "")
-      map.putInt("status", CallState.incoming.value)
-    } else {
-      map.putString("callerNumber", "")
-      map.putBoolean("isVideo", NotificationService.isVideo)
-      map.putString("transactionId", transactionId ?: "")
-      map.putInt("status", CallState.early.value)
-      map.putBoolean("incoming", false)
-      Log.d("OMISDK", "=>> ON RINGING CALL => ")
-    }
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK", if (callDirection == "inbound") "=>> ON INCOMING CALL => " else "=>> ON RINGING CALL => ")
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
 
@@ -166,15 +192,21 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
-    Log.d("OMISDK", "=>> ON OUT GOING STARTED CALL => ")
-    val map: WritableMap = WritableNativeMap()
-    map.putString("callerNumber", "")
-    map.putBoolean("isVideo", NotificationService.isVideo)
-    map.putString("transactionId", "")
-    map.putInt("status", CallState.calling.value)
-    map.putString("_id", "")
-    map.putBoolean("incoming", isIncomming)
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK", "=>> ON OUTGOING STARTED CALL => ")
+
+      val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", phoneNumber ?: "")
+          putBoolean("isVideo", NotificationService.isVideo)
+          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
+          putString("typeNumber", typeNumber)
+      }
+
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onSwitchBoardAnswer(sip: String) {
@@ -187,13 +219,18 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     Log.d("OMISDK", "=> ON REGISTER COMPLETED => status code: $statusCode")
 
     if (statusCode != 200) {
+      val normalizedStatusCode = if (statusCode == 403) 853 else statusCode
+      val typeNumber = ""
+
       val mapObject = WritableNativeMap().apply {
-        putBoolean("isVideo", false)
-        putBoolean("incoming", true)
-        putString("callerNumber", "")
-        putString("_id", "")
-        putInt("status", 6)
-        putInt("code_end_call", if (statusCode == 403) 853 else statusCode)
+          putBoolean("isVideo", false)
+          putBoolean("incoming", true)
+          putString("callerNumber", "")
+          putString("_id", "")
+          putInt("status", 6)
+          putInt("code_end_call", normalizedStatusCode)
+          putInt("codeEndCall", normalizedStatusCode)
+          putString("typeNumber", typeNumber)
       }
       sendEvent(CALL_STATE_CHANGED, mapObject)
     }
@@ -395,51 +432,68 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   @ReactMethod
-  fun getInitialCall(counter: Int = 4, promise: Promise) {
-    currentActivity?.runOnUiThread {
-      if (reactApplicationContext != null) {
-        val call = Utils.getActiveCall(reactApplicationContext!!)
-        Log.d("getInitialCall RN", "getInitialCall abc $call")
-        if (call == null) {
+  fun getInitialCall(counter: Int = 1, promise: Promise) {
+      val context = reactApplicationContext ?: run {
+          Log.e("getInitialCall", "❌ React context is null")
+          promise.resolve(false)
+          return
+      }
+
+      val call = Utils.getActiveCall(context)
+      Log.d("getInitialCall RN", "📞 Active call: $call")
+
+      if (call == null) {
           if (counter <= 0) {
-            promise.resolve(false);
+              promise.resolve(false)
           } else {
-            thread {
-              Thread.sleep(5000) // Chờ 5 giây
-              getInitialCall(counter - 1, promise); // Gọi lại hàm đệ quy
-            }
-          }
-        } else {
-          val phoneNumberTemp: String = call.remoteNumber as String
-          if (phoneNumberTemp.isNotEmpty()) {
-            val map: WritableMap = WritableNativeMap()
-            map.putString("callerNumber", phoneNumberTemp)
-            val statusPendingCall = OmiKitUtils().getStatusPendingCall(reactApplicationContext)
-            if (call.state == 3) {
-              if (statusPendingCall != 0) {
-                call.state = statusPendingCall
+              mainScope.launch {
+                  Log.d("getInitialCall RN", "🔄 Retrying in 2s... (Attempts left: $counter)")
+                  delay(1000) // Chờ 2 giây
+                  getInitialCall(counter - 1, promise) // Gọi lại hàm đệ quy
               }
-            }
-            map.putBoolean("incoming", call.direction == "inbound")
-            map.putInt("_id", call.id)
-            map.putInt("status", call.state)
-            map.putBoolean("muted", false)
-            map.putBoolean("isVideo", call.isVideo ?: false)
-            promise.resolve(map)
-            if (statusPendingCall == 2 && call.state != 5) {
-              Log.d("getInitialCall RN", "incomingReceive $statusPendingCall")
-              val map2: WritableMap = WritableNativeMap()
-              map2.putBoolean("isVideo", call.isVideo ?: false)
-              map2.putBoolean("incoming", true)
-              map2.putString("callerNumber", phoneNumberTemp)
-              map2.putString("_id", "")
-              map2.putInt("status", 2)
-              sendEvent(CALL_STATE_CHANGED, map2)
-            }
           }
-        }
+          return
+      }
+
+      val phoneNumber = call.remoteNumber as? String ?: ""
+      if (phoneNumber.isEmpty()) {
+          promise.resolve(false)
+          return
+      }
+
+      val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", phoneNumber)
+          putBoolean("incoming", call.direction == "inbound")
+          putInt("_id", call.id)
+          putInt("status", call.state)
+          putBoolean("muted", false)
+          putBoolean("isVideo", call.isVideo ?: false)
+          putString("typeNumber", typeNumber)
+      }
+
+      val statusPendingCall = OmiKitUtils().getStatusPendingCall(context)
+      if (call.state == 3 && statusPendingCall != 0) {
+          call.state = statusPendingCall
+      }
+
+      promise.resolve(map)
+
+      if (statusPendingCall == 2 && call.state != 5) {
+          Log.d("getInitialCall RN", "🚀 Incoming Receive Triggered ($statusPendingCall)")
+
+
+          val eventMap: WritableMap = WritableNativeMap().apply {
+              putBoolean("isVideo", call.isVideo ?: false)
+              putBoolean("incoming", true)
+              putString("callerNumber", phoneNumber)
+              putString("_id", "")
+              putInt("status", 2)
+              putString("typeNumber", typeNumber)
+          }
+          sendEvent(CALL_STATE_CHANGED, eventMap)
       }
-    }
   }
 
 
@@ -505,17 +559,32 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun joinCall(promise: Promise) {
-    currentActivity?.runOnUiThread {
-      if (reactApplicationContext != null) {
-        OmiClient.getInstance(reactApplicationContext!!).pickUp()
-        promise.resolve(true)
+      val appContext = reactApplicationContext.applicationContext
+      val activity = currentActivity
+
+      if (appContext == null) {
+          promise.reject("E_NULL_CONTEXT", "Application context is null")
+          return
+      }
+
+      if (activity == null) {
+          promise.reject("E_NULL_ACTIVITY", "Current activity is null")
+          return
+      }
+
+      activity.runOnUiThread {
+          try {
+              OmiClient.getInstance(appContext).pickUp()
+              promise.resolve(true)
+          } catch (e: Exception) {
+              promise.reject("E_JOIN_CALL_FAILED", "Failed to join call", e)
+          }
       }
-    }
   }
 
   @ReactMethod
   fun endCall(promise: Promise) {
-    if (isIncomming && !isAnserCall) {
+    if (isIncoming && !isAnserCall) {
       OmiClient.getInstance(reactApplicationContext!!).decline()
     } else {
       OmiClient.getInstance(reactApplicationContext!!).hangUp()
@@ -526,7 +595,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun rejectCall(promise: Promise) {
-    if (isIncomming && !isAnserCall) {
+    if (isIncoming && !isAnserCall) {
       OmiClient.getInstance(reactApplicationContext!!).decline()
     }
     promise.resolve(true)
@@ -646,6 +715,10 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         map.putString("uuid", call["uuid"] as String?)
         map.putString("full_name", call["full_name"] as String?)
         map.putString("avatar_url", call["avatar_url"] as String?)
+
+        map.putString("fullName", call["full_name"] as String?)
+        map.putString("avatarUrl", call["avatar_url"] as String?)
+
         promise.resolve(map)
       } else {
         promise.resolve(null);
@@ -671,6 +744,10 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         map.putString("uuid", call["uuid"] as String?)
         map.putString("full_name", call["full_name"] as String?)
         map.putString("avatar_url", call["avatar_url"] as String?)
+
+        map.putString("fullName", call["full_name"] as String?)
+        map.putString("avatarUrl", call["avatar_url"] as String?)
+
         promise.resolve(map)
       } else {
         promise.resolve(null);
@@ -695,6 +772,9 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         map.putString("uuid", call["uuid"] as String?)
         map.putString("full_name", call["full_name"] as String?)
         map.putString("avatar_url", call["avatar_url"] as String?)
+
+        map.putString("fullName", call["full_name"] as String?)
+        map.putString("avatarUrl", call["avatar_url"] as String?)
         promise.resolve(map)
       } else {
         promise.resolve(null)
@@ -806,18 +886,19 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
-  fun sendEvent(eventName: String?, params: Any?) {
-    if (eventName == null) {
-      Log.e("OmikitPlugin", "eventName is null. Event cannot be emitted.")
-      return
-    }
-    if (currentActivity != null) {
-      currentActivity!!.runOnUiThread {
-        reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
-          .emit(eventName, params)
+    fun sendEvent(eventName: String?, params: Any?) {
+      if (eventName == null) {
+        Log.e("OmikitPlugin", "❌ eventName is null or empty. Không thể gửi event.")
+        return
+      }
+      if (currentActivity != null) {
+        currentActivity!!.runOnUiThread {
+          reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
+            .emit(eventName, params)
+             Log.d("OmikitPlugin", "✅ Event $eventName đã được gửi thành công!")
+        }
       }
     }
-  }
 
   private fun requestPermission(isVideo: Boolean) {
     var permissions = arrayOf(

package/android/src/main/java/com/omikitplugin/utils/OmiKitUtils.kt

@@ -38,4 +38,15 @@ class OmiKitUtils {
     clearStatusPendingCall(context)
     return status
   }
+
+  fun checkTypeNumber(phoneNumber: String?): String {
+      if (phoneNumber.isNullOrBlank()) return "" // 
+
+      return when {
+          phoneNumber.length < 8 -> "internal"
+          phoneNumber.any { it.isLetter() } && phoneNumber.any { it.isDigit() } -> "zalo"
+          else -> "phone"
+      }
+  }
+
 }