omikit-plugin 2.3.0 → 2.3.2

package/README.md

@@ -305,8 +305,9 @@ if (@available(iOS 10.0, *)) {
     incomingDeclineButtonImage : "hangup", //image name
     backImage : "ic_back", //image name: icon of back button
     userImage : "calling_face", //image name: icon of user default
-    prefixMissedCallMessage: 'Cuộc gọi nhỡ từ' //config prefix message for the missed call
-    missedCallTitle: 'Cuộc gọi nhỡ' //config title for the missed call
+    prefixMissedCallMessage: 'Cuộc gọi nhỡ từ', //config prefix message for the missed call
+    missedCallTitle: 'Cuộc gọi nhỡ', //config title for the missed call
+    userNameKey: 'uuid', //we have 3 values: uuid, full_name, extension.
   });
   //incomingAcceptButtonImage, incomingDeclineButtonImage, backImage, userImage: Add these into `android/app/src/main/res/drawble`
   ```

package/android/build.gradle

@@ -96,7 +96,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  api 'vn.vihat.omicall:omi-sdk:1.2.8'
+  api 'vn.vihat.omicall:omi-sdk:1.2.27'
 
   implementation 'androidx.core:core-ktx:1.7.0'
   implementation 'androidx.fragment:fragment-ktx:1.4.0'

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

@@ -2,10 +2,8 @@ package com.omikitplugin
 
 import android.Manifest
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.hardware.camera2.CameraManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
@@ -127,17 +125,13 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   override fun initialize() {
     super.initialize()
     reactApplicationContext!!.addActivityEventListener(this)
+    OmiClient(context = reactApplicationContext!!)
+    OmiClient.instance.setListener(callListener)
   }
 
   @ReactMethod
   fun startServices(promise: Promise) {
-    OmiClient(context = reactApplicationContext!!)
-    OmiClient.instance.setListener(callListener)
     OmiClient.instance.addAccountListener(accountListener)
-    val needSetupVideo = OmiClient.instance.needSetupCamera()
-    if (needSetupVideo) {
-      setCamera()
-    }
     promise.resolve(true)
   }
 
@@ -152,6 +146,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val prefixMissedCallMessage = data.getString("prefixMissedCallMessage")
       val backImage = data.getString("backImage")
       val userImage = data.getString("userImage")
+      val userNameKey = data.getString("userNameKey")
       OmiClient.instance.configPushNotification(
         notificationIcon = notificationIcon ?: "",
         prefix = prefix ?: "Cuộc gọi tới từ: ",
@@ -161,7 +156,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         backImage = backImage ?: "ic_back",
         userImage = userImage ?: "calling_face",
         prefixMissedCallMessage = prefixMissedCallMessage ?: "Cuộc gọi nhỡ từ",
-        missedCallTitle = prefixMissedCallMessage ?: "Cuộc gọi nhỡ"
+        missedCallTitle = prefixMissedCallMessage ?: "Cuộc gọi nhỡ",
+        userNameKey = userNameKey ?: "extension",
       )
       promise.resolve(true)
     }
@@ -185,9 +181,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         )
       }
       requestPermission(isVideo)
-      if (isVideo) {
-        setCamera()
-      }
       promise.resolve(true)
     }
   }
@@ -215,9 +208,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         }
       }
       requestPermission(isVideo)
-      if (isVideo) {
-        setCamera()
-      }
       promise.resolve(loginResult)
     }
   }
@@ -545,12 +535,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     )
   }
 
-  private fun setCamera() {
-    val cm =
-      reactApplicationContext!!.getSystemService(Context.CAMERA_SERVICE) as CameraManager
-    OmiClient.instance.setCameraManager(cm)
-  }
-
   override fun onActivityResult(p0: Activity?, p1: Int, p2: Int, p3: Intent?) {
 
   }

package/ios/CallProcess/CallManager.swift

@@ -99,10 +99,15 @@ class CallManager {
     }
     
     func configNotification(data: [String: Any]) {
+        let user = UserDefaults.standard
+        if let prefix = data["prefix"] as? String, let userNameKey = data["userNameKey"] as? String {
+            user.set(prefix, forKey: KEY_OMI_PREFIX)
+            user.set(userNameKey, forKey: KEY_OMI_USER_NAME_KEY)
+        }
         if let title = data["missedCallTitle"] as? String, let message = data["prefixMissedCallMessage"] as? String {
             let user = UserDefaults.standard
-            user.set(title, forKey: "missedCallTitle")
-            user.set(message, forKey: "prefixMissedCallMessage")
+            user.set(title, forKey: "omicall/missedCallTitle")
+            user.set(message, forKey: "omicall/prefixMissedCallMessage")
         }
     }
     
@@ -114,8 +119,8 @@ class CallManager {
                        break
                     case .authorized, .provisional:
                         let user = UserDefaults.standard
-                        let title = user.string(forKey: "missedCallTitle") ?? ""
-                        let message = user.string(forKey: "prefixMissedCallMessage") ?? ""
+                        let title = user.string(forKey: "omicall/missedCallTitle") ?? ""
+                        let message = user.string(forKey: "omicall/prefixMissedCallMessage") ?? ""
                         let content      = UNMutableNotificationContent()
                         content.title    = title
                         content.body = "\(message) \(call.callerNumber!)"

package/omikit-plugin.podspec

@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
   end
-  s.dependency "OmiKit", '1.5.31'
+  s.dependency "OmiKit", '1.5.32'
 end

package/package.json

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