omikit-plugin 3.2.50 → 3.2.52

package/README.md

@@ -366,7 +366,16 @@ class MainActivity : ReactActivity() {
     }
 }
 ```
+- Tips: Error Use of undeclared identifier 'OmikitNotification' at file `AppDelegate.m`, please import this line below
 
+```swift
+#if __has_include("OmikitNotification.h")
+#import "OmikitNotification.h"
+#else
+#import <omikit_plugin/OmikitNotification.h>
+#endif
+
+```
 - Add these lines into `Info.plist`:
 
 ```swift
@@ -382,8 +391,9 @@ class MainActivity : ReactActivity() {
 ```swift
 - (void)application:(UIApplication*)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)devToken
 {
-    // parse token bytes to string
-    const char *data = [devToken bytes];
+      // parse token bytes to string
+     // const char *data = [devToken bytes];
+     const unsigned char *data = (const unsigned char *)[devToken bytes];
     NSMutableString *token = [NSMutableString string];
     for (NSUInteger i = 0; i < [devToken length]; i++)
     {
@@ -417,6 +427,23 @@ We support 2 environments. So you need set correct key in Appdelegate.
 
 \*Note: At Tab Build Setting off Target Project, you need set: **_Enable Modules (C and Objective C)_** : YES\*
 
+#### Currently, OMICALL does not support React Native new architect.
+Config turn Off for new architect
+For iOS
+```Ruby
+use_react_native!(
+    :path => config[:reactNativePath],
+    :new_arch_enabled => false,  // <=== add this line 
+   ... your config
+  )
+```
+
+For Android
+Open file android/gradle.properties and add line below:
+```kotlin
+# Tắt New Architecture
+newArchEnabled=false
+```
 #### iOS(Swift):
 
 - Assets: Add `call_image` into assets folder to update callkit image. We only support png style.

package/android/build.gradle

@@ -103,7 +103,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.12'
+  api 'vn.vihat.omicall:omi-sdk:2.3.14'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

package/android/gradle.properties

@@ -4,4 +4,5 @@ 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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
+newArchEnabled=false

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

@@ -48,13 +48,13 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
     isIncomming = 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)
-      sendEvent(CALL_STATE_CHANGED, map)
+    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)
+    sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onCallEstablished(
@@ -158,9 +158,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
 
   override fun onHold(isHold: Boolean) {
+    sendEvent(HOLD, isHold)
   }
 
   override fun onMuted(isMuted: Boolean) {
+     sendEvent(MUTED, isMuted)
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
@@ -183,20 +185,33 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   override fun onRegisterCompleted(statusCode: Int) {
     Log.d("OMISDK", "=> ON REGISTER COMPLETED => status code: $statusCode")
-    
+
     if (statusCode != 200) {
-        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)
+      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)
+      }
+      sendEvent(CALL_STATE_CHANGED, mapObject)
+    }
+  }
+
+  override fun onRequestPermission(permissions: Array<String>) {
+
+    val map = WritableNativeMap().apply {
+      putArray("permissions", WritableNativeArray().apply {
+        permissions.forEach {
+          pushString(it)
         }
-        sendEvent(CALL_STATE_CHANGED, mapObject)
+      })
     }
-}
+    Log.d("OMISDK", "=>> onRequestPermission => $map")
+    sendEvent(REQUEST_PERMISSION, map)
 
+  }
 
   override fun onVideoSize(width: Int, height: Int) {
 
@@ -285,7 +300,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val audioNotificationDescription = data?.getString("audioNotificationDescription") ?: ""
       val videoNotificationDescription = data?.getString("videoNotificationDescription") ?: ""
       val displayNameType = data?.getString("displayNameType") ?: ""
-      val appRepresentName =  data?.getString("representName") ?: "" 
+      val appRepresentName = data?.getString("representName") ?: ""
 
 
       OmiClient.getInstance(reactApplicationContext!!).configPushNotification(
@@ -304,7 +319,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         missedChannelName = "Cuộc gọi nhỡ",
         displayNameType = userNameKey ?: "full_name",
         notificationMissedCallPrefix = prefixMissedCallMessage ?: "Cuộc gọi nhỡ từ",
-        representName= appRepresentName ?: ""
+        representName = appRepresentName ?: ""
       )
       promise.resolve(true)
     }
@@ -319,14 +334,22 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val realm = data.getString("realm")
       val host = data.getString("host") ?: "vh.omicrm.com"
       val isVideo = data.getBoolean("isVideo")
-      val firebaseToken = data.getString("fcmToken")  
+      val firebaseToken = data.getString("fcmToken")
       val projectId = data.getString("projectId") ?: ""
 
       withContext(Dispatchers.Default) {
         try {
           if (userName != null && password != null && realm != null && firebaseToken != null) {
             loginResult =
-              OmiClient.register(userName, password, realm, isVideo ?: true, firebaseToken, host, projectId)
+              OmiClient.register(
+                userName,
+                password,
+                realm,
+                isVideo ?: true,
+                firebaseToken,
+                host,
+                projectId
+              )
             promise.resolve(loginResult)
           }
         } catch (_: Throwable) {
@@ -394,20 +417,20 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
             val statusPendingCall = OmiKitUtils().getStatusPendingCall(reactApplicationContext)
             if (call.state == 3) {
               if (statusPendingCall != 0) {
-               call.state = statusPendingCall
+                call.state = statusPendingCall
               }
             }
             map.putBoolean("incoming", call.direction == "inbound")
             map.putInt("_id", call.id)
-            map.putInt("status", call.state )
+            map.putInt("status", call.state)
             map.putBoolean("muted", false)
             map.putBoolean("isVideo", call.isVideo ?: false)
             promise.resolve(map)
-            if( statusPendingCall == 2 && call.state !=5){
+            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.putBoolean("incoming", true)
               map2.putString("callerNumber", phoneNumberTemp)
               map2.putString("_id", "")
               map2.putInt("status", 2)
@@ -517,6 +540,29 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
+
+  @ReactMethod
+  fun toggleHold(promise: Promise) {
+      mainScope.launch {
+          try {
+              // Gọi hàm toggleHold() và kiểm tra kết quả
+              val result = withContext(Dispatchers.IO) {
+                  OmiClient.getInstance(reactApplicationContext!!).toggleHold()
+              }
+
+              // Kiểm tra nếu toggleHold trả về Unit
+              if (result == Unit) {
+                  promise.resolve(null) // Trả về null nếu kết quả là Unit
+              } else {
+                  promise.resolve(result)
+              }
+          } catch (e: Exception) {
+              promise.reject("TOGGLE_HOLD_EXCEPTION", "Exception occurred: ${e.message}", e)
+          }
+      }
+    }
+  }
+
   @ReactMethod
   fun toggleSpeaker(promise: Promise) {
     currentActivity?.runOnUiThread {
@@ -625,28 +671,28 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   @ReactMethod
-fun getUserInfo(phone: String, promise: Promise) {
+  fun getUserInfo(phone: String, promise: Promise) {
     mainScope.launch {
-        var callResult: Any? = null
-        withContext(Dispatchers.Default) {
-            try {
-                callResult = OmiClient.getInstance(reactApplicationContext!!).getUserInfo(phone)
-            } catch (_: Throwable) {
-            }
-        }
-        if (callResult != null && callResult is Map<*, *>) {
-            val call = callResult as Map<*, *>
-            val map: WritableMap = WritableNativeMap()
-            map.putString("extension", call["extension"] as String?)
-            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?)
-            promise.resolve(map)
-        } else {
-            promise.resolve(null)
+      var callResult: Any? = null
+      withContext(Dispatchers.Default) {
+        try {
+          callResult = OmiClient.getInstance(reactApplicationContext!!).getUserInfo(phone)
+        } catch (_: Throwable) {
         }
+      }
+      if (callResult != null && callResult is Map<*, *>) {
+        val call = callResult as Map<*, *>
+        val map: WritableMap = WritableNativeMap()
+        map.putString("extension", call["extension"] as String?)
+        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?)
+        promise.resolve(map)
+      } else {
+        promise.resolve(null)
+      }
     }
-}
+  }
 
   @ReactMethod
   fun getAudio(promise: Promise) {
@@ -732,7 +778,7 @@ fun getUserInfo(phone: String, promise: Promise) {
         val isAcceptedCall = intent.getBooleanExtra(
           SipServiceConstants.ACTION_ACCEPT_INCOMING_CALL, false
         )
-        if(isReopenCall){
+        if (isReopenCall) {
           val activeCall = Utils.getActiveCall(context)
           OmikitPluginModule(context).onCallEstablished(
             activeCall?.id ?: 0,
@@ -754,14 +800,14 @@ fun getUserInfo(phone: String, promise: Promise) {
 
   fun sendEvent(eventName: String?, params: Any?) {
     if (eventName == null) {
-        Log.e("OmikitPlugin", "eventName is null. Event cannot be emitted.")
-        return
+      Log.e("OmikitPlugin", "eventName is null. Event cannot be emitted.")
+      return
     }
     if (currentActivity != null) {
-        currentActivity!!.runOnUiThread {
-            reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
-                .emit(eventName, params)
-        }
+      currentActivity!!.runOnUiThread {
+        reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
+          .emit(eventName, params)
+      }
     }
   }
 
@@ -821,12 +867,15 @@ fun getUserInfo(phone: String, promise: Promise) {
   }
 
   override fun onNewIntent(p0: Intent?) {
-    if (p0 != null && p0.hasExtra(SipServiceConstants.PARAM_NUMBER)) {
+    if (p0 != null && p0.hasExtra(SipServiceConstants.PARAM_IS_MISSED_CALL)) {
       //do your Stuff
-      val map: WritableMap = WritableNativeMap()
-      map.putString("callerNumber", p0.getStringExtra(SipServiceConstants.PARAM_NUMBER) ?: "")
-      map.putBoolean("isVideo", p0.getBooleanExtra(SipServiceConstants.PARAM_IS_VIDEO, false))
-      sendEvent(CLICK_MISSED_CALL, map)
+
+      if (p0.getBooleanExtra(SipServiceConstants.PARAM_IS_MISSED_CALL, false)) {
+        val map: WritableMap = WritableNativeMap()
+        map.putString("callerNumber", p0.getStringExtra(SipServiceConstants.PARAM_NUMBER) ?: "")
+        map.putBoolean("isVideo", p0.getBooleanExtra(SipServiceConstants.PARAM_IS_VIDEO, false))
+        sendEvent(CLICK_MISSED_CALL, map)
+      }
     }
   }
 }

package/android/src/main/java/com/omikitplugin/constants/constant.kt

@@ -34,6 +34,8 @@ const val CLICK_MISSED_CALL = "CLICK_MISSED_CALL"
 const val SWITCHBOARD_ANSWER = "SWITCHBOARD_ANSWER"
 const val CALL_QUALITY = "CALL_QUALITY"
 const val AUDIO_CHANGE = "AUDIO_CHANGE"
+const val HOLD = "HOLD"
+const val REQUEST_PERMISSION = "REQUEST_PERMISSION"
 
 //PREFFERENCES
 const val CURRENT_STATUS = "CURRENT_STATUS"