omikit-plugin 3.1.4 → 3.1.6

package/README.md

@@ -361,7 +361,7 @@ We support 2 environments. So you need set correct key in Appdelegate.
   - Create OmiKit: OmiKit need userName, password, realm, host to init enviroment. ViHAT Group will provide informations for you. Please contact for my sale:
 
 ```
-    import { initCall } from 'omikit-plugin';
+    import { initCallWithUserPassword } from 'omikit-plugin';
 
     const loginInfo = {
       userName: userName, //string
@@ -369,9 +369,9 @@ We support 2 environments. So you need set correct key in Appdelegate.
       realm: realm, //string
       isVideo: isVideo, //boolean: true/false
       host: host, //string
-            fcmToken: fcmToken, //string
+      fcmToken: fcmToken, //string
     };
-    const result = await initCall(loginInfo);
+    const result = await initCallWithUserPassword(loginInfo);
     //result is true then user login successfully.
 ```
 

package/android/build.gradle

@@ -104,7 +104,7 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
 //   implementation "com.facebook.react:react-native"
-  api 'vn.vihat.omicall:omi-sdk:2.0.37'
+  api 'vn.vihat.omicall:omi-sdk:2.0.39'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -126,6 +126,8 @@ dependencies {
   implementation "com.google.code.gson:gson:2.8.9"
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
+  implementation "com.github.voismart:crypto:0.1.0"
+
   implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
   implementation "com.github.bumptech.glide:glide:4.15.1"
   annotationProcessor "com.github.bumptech.glide:compiler:4.15.1"

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

@@ -184,7 +184,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   private fun messageCall(type: Int): String {
     return when (type) {
-      // 401 -> "INVALID_UUID"
+      // 0 -> "INVALID_UUID"
       // 1 -> "INVALID_PHONE_NUMBER"
       // 2 -> "SAME_PHONE_NUMBER_WITH_PHONE_REGISTER"
       // 3 -> "MAX_RETRY"
@@ -196,14 +196,14 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       // 8 -> "START_CALL_SUCCESS"
       // 9 -> "HAVE_ANOTHER_CALL"
       200 -> "START_CALL_SUCCESS"
-      400 -> "AL"
+      400 -> "ALREADY_IN_CALL"
       401 -> "INVALID_UUID"
       402 -> "INVALID_PHONE_NUMBER"
       403 -> "CAN_NOT_CALL_YOURSELF"
       404 -> "SWITCHBOARD_NOT_CONNECTED"
       405 -> "PERMISSION_DENIED"
       406 -> "PERMISSION_DENIED"
-      407 -> "COULD_NOT_REGISTER_ACCOUNT"
+      407 -> "SWITCHBOARD_REGISTERING"
       else -> "HAVE_ANOTHER_CALL"
     }
   }
@@ -212,11 +212,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     super.initialize()
     reactApplicationContext!!.addActivityEventListener(this)
     Handler(Looper.getMainLooper()).post {
-       OmiClient(context = reactApplicationContext!!)
-       OmiClient.getInstance(reactApplicationContext!!).addCallStateListener(this)
-          OmiClient.getInstance(reactApplicationContext!!)
-            OmiClient.isAppReady = true;
-            OmiClient.getInstance(reactApplicationContext!!).addCallStateListener(this)
+      OmiClient.getInstance(reactApplicationContext!!).addCallStateListener(this)
+      OmiClient.isAppReady = true;
     }
   }
 
@@ -293,10 +290,12 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         val host = data.getString("host")
         val isVideo = data.getBoolean("isVideo")
           val firebaseToken = data.getString("fcmToken") as String
-          Log.d("dataOmi", "INIT_CALL_USER_PASSWORD $userName -- $password --$realm --$isVideo -- $host ")
+
+          Log.d("dataOmi", "INIT_CALL_USER_PASSWORD $userName -- $password --$realm --$isVideo -- $host")
+
           withContext(Dispatchers.Default) {
               try {
-              if (userName != null && password != null && realm != null && host != null) {
+              if (userName != null && password != null && realm != null) {
                   OmiClient.register(userName, password, realm ,  isVideo ?: true, firebaseToken, host)
                 }
               } catch (_: Throwable) {
@@ -313,22 +312,22 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val usrName = data.getString("fullName")
       val usrUuid = data.getString("usrUuid")
       val apiKey = data.getString("apiKey")
-      val isVideo = data.getBoolean("isVideo")
+      val isVideo = data.getBoolean("isVideo") ?: false
       val phone = data.getString("phone")
       val firebaseToken = data.getString("fcmToken") as String
-      withContext(Dispatchers.Default) {
-        try {
-          if (usrName != null && usrUuid != null && apiKey != null) {
-            loginResult = OmiClient.registerWithApiKey(
-              apiKey = apiKey,
-              userName = usrName,
-              uuid = usrUuid,
-              phone = phone ?: "",
-              isVideo = isVideo,
-              firebaseToken
-            )
-          }
-        } catch (_: Throwable) {
+       withContext(Dispatchers.Default) {
+         try {
+            if (usrName != null && usrUuid != null && apiKey != null) {
+              loginResult = OmiClient.registerWithApiKey(
+                    apiKey = apiKey,
+                    userName = usrName,
+                    uuid = usrUuid,
+                    phone = phone ?: "",
+                    isVideo = isVideo,
+                    firebaseToken
+                  )
+            }
+          } catch (_: Throwable) {
 
         }
       }
@@ -383,26 +382,23 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     if (audio == PackageManager.PERMISSION_GRANTED) {
       currentActivity?.runOnUiThread {
         val phoneNumber = data.getString("phoneNumber") as String
-        val isVideo = data.getBoolean("isVideo")
+        val isVideo = data.getBoolean("isVideo") ?: false ;
         val startCallResult =   OmiClient.getInstance(reactApplicationContext!!).startCall(phoneNumber, isVideo)
-        Log.d("dataOmi", "startCall  ==>> ${startCallResult} ")
-        Log.d("dataOmi", "startCall2  ==>> ${startCallResult.value} ")
         var statusCalltemp =  startCallResult.value as Int;
         if(startCallResult.value == 200 ){
           statusCalltemp = 8
         }
-         map.putString("status", statusCalltemp.toString())
-         map.putString("_id", "")
-          map.putString("message", messageCall(startCallResult.value) as String)
-      Log.d("OMISDK", "=>> ON START CALL =>  $map")
+        map.putInt("status", statusCalltemp)
+        map.putString("_id", "")
+        map.putString("message", messageCall(startCallResult.value) as String)
         promise.resolve(map)
       }
     } else {
-      map.putString("status","4")
-      map.putString("_id", "")
-      map.putString("message", messageCall(4) as String)
-      Log.d("OMISDK", "=>> ON START CALL FAIL BECAUSE NEED PERMISSION =>  $map")
-      promise.resolve(map)
+        map.putInt("status", 4)
+        map.putString("_id", "")
+        map.putString("message", messageCall(406) as String)
+        Log.d("OMISDK", "=>> ON START CALL FAIL BECAUSE NEED PERMISSION =>  $map")
+        promise.resolve(map)
     }
   }
 

package/ios/CallProcess/CallManager.swift

@@ -1,4 +1,4 @@
-//
+    //
 //  CallUtils.swift
 //  OMICall Contact Center
 //
@@ -38,14 +38,21 @@ class CallManager {
         return currentCall
     }
 
-     func transferCall(_ phoneNumber: String){
+     func transferCall(_ phoneNumber: String)-> Bool {
+        var result = false;
         do {
-            if let callInfo = omiLib.getCurrentCall() {
-                callInfo.blindTransferCall(withNumber: phoneNumber)
-            }
+                if let callInfo = self.omiLib.getCurrentConfirmCall() {
+                    dump(callInfo)
+                    if callInfo.callState != .disconnected {
+                        callInfo.blindTransferCall(withNumber: phoneNumber);
+                        result = true
+                    }
+                }
         } catch let error {
             print("ERROR_WHEN_TRANSFER_CALL_IOS: ", error)
         }
+        print("calllZiii 2 ==> \(result)")
+        return result
     }
 
     
@@ -79,6 +86,43 @@ class CallManager {
         }
     }
     
+    func convertDictionaryToJson(dictionary: [String: Any]) -> String? {
+           do {
+               let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: [])
+               if let jsonString = String(data: jsonData, encoding: .utf8) {
+                   return jsonString
+               }
+           } catch {
+               print("Error converting dictionary to JSON: \(error.localizedDescription)")
+           }
+           return nil
+       }
+
+     private func messageCall(type: Int) -> String {
+            switch(type){
+                case 0:
+                    return "INVALID_UUID"
+                case 1:
+                     return "INVALID_PHONE_NUMBER"
+                case 2:
+                     return "SAME_PHONE_NUMBER_WITH_PHONE_REGISTER"
+                case 3:
+                    return "MAX_RETRY"
+                case 4:
+                    return "PERMISSION_DENIED"
+                case 5:
+                    return "COULD_NOT_FIND_END_POINT"
+                case 6:
+                    return "REGISTER_ACCOUNT_FAIL"
+                case 7:
+                    return "START_CALL_FAIL"
+                case 9:
+                    return "HAVE_ANOTHER_CALL"
+                default:
+                    return "START_CALL_SUCCESS"
+            }
+        }
+    
     private func requestPermission(isVideo: Bool) {
         AVCaptureDevice.requestAccess(for: .audio) { _ in
 //            print("request audio")
@@ -112,7 +156,7 @@ class CallManager {
         requestPermission(isVideo: isVideo)
         return true
     }
-    
+
     func showMissedCall() {
         OmiClient.setMissedCall { call in
             UNUserNotificationCenter.current().getNotificationSettings { settings in
@@ -280,7 +324,7 @@ class CallManager {
             guestPhone = call.callerNumber ?? ""
             break
         case OMICallState.disconnected.rawValue:
-            tempCallInfo = getCallInfo(call: call) ?? [:]
+            tempCallInfo = getCallInfo(call: call)
             if (videoManager != nil) {
                 videoManager = nil
             }
@@ -321,29 +365,58 @@ class CallManager {
     
     
     /// Start call
-    func startCall(_ phoneNumber: String, isVideo: Bool, completion: @escaping (_ : Int) -> Void) {
+    func startCall(_ phoneNumber: String, isVideo: Bool, completion: @escaping (_ : String) -> Void) {
         let secondsSinceCurrentTime = lastTimeCall.timeIntervalSinceNow
         guestPhone = phoneNumber
         OmiClient.startCall(phoneNumber, isVideo: isVideo) { status in
             DispatchQueue.main.async {
-                completion(status.rawValue)
+                let callCurrent = self.omiLib.getCurrentCall()
+                     var dataToSend: [String: Any] = [
+                                        "status": status.rawValue,
+                                        "_id": "",
+                                        "message": self.messageCall(type: status.rawValue)
+                                    ]
+                                        if(callCurrent != nil){
+                                            dataToSend["_id"] = String(describing: OmiCallModel(omiCall: callCurrent!).uuid)
+                                        }
+                                    if let jsonString = self.convertDictionaryToJson(dictionary: dataToSend) {
+                                        completion(jsonString)
+                                    } else {
+                                        completion("Conversion to JSON failed")
+                                    }
+                                    return     
             }
         }
     }
     
     /// Start call
-    func startCallWithUuid(_ uuid: String, isVideo: Bool, completion: @escaping (_ : Int) -> Void) {
+    func startCallWithUuid(_ uuid: String, isVideo: Bool, completion: @escaping (_ : String) -> Void) {
         let phoneNumber = OmiClient.getPhone(uuid)
         if let phone = phoneNumber {
             guestPhone = phoneNumber ?? ""
-            OmiClient.startCall(phone, isVideo: isVideo) { status in
-                DispatchQueue.main.async {
-                    completion(status.rawValue)
+               DispatchQueue.main.async {
+                OmiClient.startCall(phone, isVideo: isVideo) { statusCall in
+                    let callCurrent = self.omiLib.getCurrentCall()
+                        // completion(status.rawValue)
+                        var dataToSend: [String: Any] = [
+                                        "status": statusCall.rawValue,
+                                        "_id": "",
+                                        "message": self.messageCall(type: statusCall.rawValue)
+                                    ]
+                                        if(callCurrent != nil){
+                                            dataToSend["_id"] = String(describing: OmiCallModel(omiCall: callCurrent!).uuid)
+                                        }
+                                    if let jsonString = self.convertDictionaryToJson(dictionary: dataToSend) {
+                                        completion(jsonString)
+                                    } else {
+                                        completion("Conversion to JSON failed")
+                                    }
+                                    return      
+                    
                 }
             }
             return
         }
-        completion(OMIStartCallStatus.invalidUuid.rawValue)
     }
     
     func endAvailableCall() -> [String: Any] {

package/omikit-plugin.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => "11.0" }
-  s.source       = { :git => "https://github.com/stevennguyenn/omikit-plugin.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/VIHATTeam/OMICALL-React-Native-SDK.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
   end
-  s.dependency "OmiKit", '1.5.85'
-end
+  s.dependency "OmiKit", '1.5.84'
+end 

package/package.json

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