omikit-plugin 3.0.2 → 3.0.4

package/README.md

@@ -657,10 +657,32 @@ useEffect(() => {
 ```
 
   - Important event `onCallStateChanged`: We provide it to listen call state change.
+ //OmiAction have 2 variables: actionName and data
+ ```
+    - Action Name value: 
+        - `onCallStateChanged`: Call state changed.
+        - `onSwitchboardAnswer`: Switchboard sip is listening. 
+        - List status call: 
+          + unknown(0),
+          + calling(1),
+          + incoming(2),
+          + early(3),
+          + connecting(4),
+          + confirmed(5),
+          + disconnected(6);
+    + onCallStateChanged is call state tracking event. We will return status of state. Please refer `OmiCallState`.
+          `onCallStateChanged value:`
+              + isVideo: value boolean (true is call Video)
+              + status: number (value matching with List status call )
+              + callerNumber: phone number 
+              + incoming: boolean - status call incoming or outgoing
+              + _id: option (id of every call)
+
+    + `Incoming call` state lifecycle: incoming -> connecting -> confirmed -> disconnected
+    + `Outgoing call` state lifecycle: calling -> early -> connecting -> confirmed -> disconnected 
+
+    + onSwitchboardAnswer have callback when employee answered script call.
 
-    + It is call state tracking event. We will return status of state. Please refer `OmiCallState`.
-    + Incoming call state lifecycle: incoming(receive on foreround state) -> early -> connecting -> confirmed -> disconnected
-    + Outgoing call state lifecycle: calling -> early (call created) -> connecting -> confirmed -> disconnected
 
 - Action Name value:
   - `OmiCallEvent.onMuted`: Audio changed.

package/android/build.gradle

@@ -15,12 +15,12 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
-    // noinspection DifferentKotlinGradleVersion
+    classpath 'com.android.tools.build:gradle-api:7.1.2'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath 'com.google.dagger:hilt-android-gradle-plugin:2.39.1'
     classpath 'com.github.kezong:fat-aar:1.3.8'
     classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.3"
+    classpath 'com.android.tools.build:gradle:4.0.0'
   }
 }
 
@@ -28,11 +28,12 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
 
+
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
@@ -68,6 +69,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  // kotlinOptions {
+  //     jvmTarget = '1.8'
+  // }
+
   dataBinding {
     enabled = true
   }
@@ -101,14 +106,15 @@ dependencies {
 //   implementation "com.facebook.react:react-native"
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-  api 'vn.vihat.omicall:omi-sdk:1.4.49'
+  // implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+  api 'vn.vihat.omicall:omi-sdk:2.0.19'
 //    implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    implementation files('OmiSDK.aar')
-  implementation 'androidx.appcompat:appcompat:1.5.0'
-  implementation 'com.google.android.material:material:1.6.1'
+  implementation "com.google.android.flexbox:flexbox:3.0.0"
+  implementation "androidx.appcompat:appcompat:1.6.1"
+  implementation "androidx.lifecycle:lifecycle-process:2.6.1"
+  implementation "com.google.android.material:material:1.9.0"
   implementation 'com.google.firebase:firebase-messaging-ktx:23.1.2'
-  implementation 'androidx.lifecycle:lifecycle-process:2.1.0'
   implementation("com.squareup.retrofit2:retrofit:2.9.0") {
     exclude module: 'okhttp'
   }
@@ -119,6 +125,15 @@ 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(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"
+  implementation("androidx.work:work-runtime:2.8.1")
+
+  def coroutines_version = '1.7.2'
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -33,7 +33,7 @@ class FLLocalCameraView(private val context: ReactApplicationContext) :
 
   fun refreshTexture() {
       cameraView.surfaceTexture?.let {
-        OmiClient.instance.setupLocalVideoFeed(Surface(it))
+        // OmiClient.getInstance().setupLocalVideoFeed(Surface(it))
         ScaleManager.adjustAspectRatio(
           cameraView,
           Size(cameraView.width, cameraView.height),

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

@@ -26,7 +26,7 @@ class FLRemoteCameraModule(reactContext: ReactApplicationContext, remoteViewMana
   @ReactMethod
   fun refresh(promise: Promise) {
     cameraView.surfaceTexture?.let {
-      OmiClient.instance.setupIncomingVideoFeed(Surface(it))
+      // OmiClient.instance.setupIncomingVideoFeed(Surface(it))
       ScaleManager.adjustAspectRatio(cameraView,
         Size(cameraView.width, cameraView.height),
         Size(1280,720)

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

@@ -34,35 +34,45 @@ import vn.vihat.omicall.omisdk.utils.SipServiceConstants
 class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   ReactContextBaseJavaModule(reactContext), ActivityEventListener, OmiListener {
   private val mainScope = CoroutineScope(Dispatchers.Main)
+  private var isIncomming: Boolean = false
+  private var callerNumberTemp: String = ""
+  private var isAnserCall: Boolean = false
+
 
   override fun getName(): String {
     return NAME
   }
 
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
+    isIncomming = true;
     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)
     Log.d("omikit", "incomingReceived: ")
   }
 
-  override fun networkHealth(stat: Map<String, *>, quality: Int) {
-    val map: WritableMap = WritableNativeMap()
-    map.putInt("quality", quality)
-    sendEvent(CALL_QUALITY, map)
-  }
-
-  override fun onAudioChanged(audioInfo: Map<String, Any>) {
-    val audio: WritableMap = WritableNativeMap()
-    audio.putString("name", audioInfo["name"] as String)
-    audio.putInt("type", audioInfo["type"] as Int)
-    val map: WritableMap = WritableNativeMap()
-    val writeList = WritableNativeArray()
-    writeList.pushMap(audio)
-    map.putArray("data", writeList)
-    sendEvent(AUDIO_CHANGE, map)
+  override fun onCallEstablished(
+    callerId: Int,
+    phoneNumber: String?,
+    isVideo: Boolean?,
+    startTime: Long,
+    transactionId: String?,
+  ) {
+    isAnserCall = true
+    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)
+    }, 500)
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
@@ -82,33 +92,55 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     sendEvent(CALL_STATE_CHANGED, map)
   }
 
-  override fun onCallEstablished(
-    callerId: Int,
-    phoneNumber: String?,
-    isVideo: Boolean?,
-    startTime: Long,
-    transactionId: String?,
-  ) {
-    Handler(Looper.getMainLooper()).postDelayed({
-      Log.d("OmikitReactNative", "onCallEstablished")
-      val map: WritableMap = WritableNativeMap()
-      map.putString("callerNumber", phoneNumber)
-      map.putBoolean("isVideo", isVideo ?: true)
-      map.putString("transactionId", transactionId)
-      map.putInt("status", CallState.confirmed.value)
-      sendEvent(CALL_STATE_CHANGED, map)
-    }, 500)
-  }
-
   override fun onConnecting() {
     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)
   }
 
+  override fun onRinging(callerId: Int, transactionId: String?) {
+    var callDirection  = OmiClient.callDirection
+    val map: WritableMap = WritableNativeMap()
+
+    if(callDirection == "inbound") {
+      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)
+    }
+    sendEvent(CALL_STATE_CHANGED, map)
+  }
+
+
+  override fun networkHealth(stat: Map<String, *>, quality: Int) {
+    val map: WritableMap = WritableNativeMap()
+    map.putInt("quality", quality)
+    sendEvent(CALL_QUALITY, map)
+  }
+
+  override fun onAudioChanged(audioInfo: Map<String, Any>) {
+    val audio: WritableMap = WritableNativeMap()
+    audio.putString("name", audioInfo["name"] as String)
+    audio.putInt("type", audioInfo["type"] as Int)
+    val map: WritableMap = WritableNativeMap()
+    val writeList = WritableNativeArray()
+    writeList.pushMap(audio)
+    map.putArray("data", writeList)
+    sendEvent(AUDIO_CHANGE, map)
+  }
+
 
   override fun onHold(isHold: Boolean) {
   }
@@ -122,15 +154,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     map.putBoolean("isVideo", NotificationService.isVideo)
     map.putString("transactionId", "")
     map.putInt("status", CallState.calling.value)
-    sendEvent(CALL_STATE_CHANGED, map)
-  }
-
-  override fun onRinging(callerId: Int, transactionId: String?) {
-    val map: WritableMap = WritableNativeMap()
-    map.putString("callerNumber", "")
-    map.putBoolean("isVideo", false)
-    map.putString("transactionId", transactionId ?: "")
-    map.putInt("status", CallState.early.value)
+    map.putString("_id", "")
+    map.putBoolean("incoming",isIncomming)
     sendEvent(CALL_STATE_CHANGED, map)
   }
 
@@ -150,18 +175,37 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
+  private fun messageCall(type: Int): String {
+    return when (type) {
+      0 -> "INVALID_UUID"
+      1 -> "INVALID_PHONE_NUMBER"
+      2 -> "SAME_PHONE_NUMBER_WITH_PHONE_REGISTER"
+      3 -> "MAX_RETRY"
+      4 -> "PERMISSION_DENIED"
+      5 -> "COULD_NOT_FIND_END_POINT"
+      6 -> "REGISTER_ACCOUNT_FAIL"
+      7 -> "START_CALL_FAIL"
+      8 -> "START_CALL_SUCCESS"
+      9 -> "HAVE_ANOTHER_CALL"
+      else -> "START_CALL_SUCCESS"
+    }
+  }
+
   override fun initialize() {
     super.initialize()
     reactApplicationContext!!.addActivityEventListener(this)
     Handler(Looper.getMainLooper()).post {
-      OmiClient(context = reactApplicationContext!!)
-      OmiClient.instance.addCallStateListener(this)
+       OmiClient(context = reactApplicationContext!!)
+       OmiClient.getInstance(reactApplicationContext!!).addCallStateListener(this)
+          OmiClient.getInstance(reactApplicationContext!!)
+            OmiClient.isAppReady = true;
+            OmiClient.getInstance(reactApplicationContext!!).addCallStateListener(this)
     }
   }
 
   @ReactMethod
   fun startServices(promise: Promise) {
-    OmiClient.instance.addAccountListener(accountListener)
+    OmiClient.getInstance(reactApplicationContext!!).addAccountListener(accountListener)
     promise.resolve(true)
   }
 
@@ -185,34 +229,37 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun configPushNotification(data: ReadableMap, promise: Promise) {
     currentActivity?.runOnUiThread {
-      val notificationIcon = data.getString("notificationIcon")
-      val prefix = data.getString("prefix")
-      val incomingBackgroundColor = data.getString("incomingBackgroundColor")
-      val incomingAcceptButtonImage = data.getString("incomingAcceptButtonImage")
-      val incomingDeclineButtonImage = data.getString("incomingDeclineButtonImage")
-      val prefixMissedCallMessage = data.getString("prefixMissedCallMessage")
-      val backImage = data.getString("backImage")
-      val userImage = data.getString("userImage")
-      val userNameKey = data.getString("userNameKey")
-      val channelId = data.getString("channelId")
-      val audioNotificationDescription = data.getString("audioNotificationDescription")
-      val videoNotificationDescription = data.getString("videoNotificationDescription")
-      OmiClient.instance.configPushNotification(
-        notificationIcon = notificationIcon ?: "",
-        prefix = prefix ?: "Cuộc gọi tới từ: ",
-        incomingBackgroundColor = incomingBackgroundColor ?: "#FFFFFFFF",
-        incomingAcceptButtonImage = incomingAcceptButtonImage ?: "join_call",
-        incomingDeclineButtonImage = incomingDeclineButtonImage ?: "hangup",
-        backImage = backImage ?: "ic_back",
-        userImage = userImage ?: "calling_face",
-        prefixMissedCallMessage = prefixMissedCallMessage ?: "Cuộc gọi nhỡ từ",
-        userNameKey = userNameKey ?: "extension",
-        channelId = channelId ?: "",
-        ringtone = null,
-        fullScreenUserImage = userImage ?: "calling_face",
-        showUserInfoInFullScreen = false,
-        audioNotificationDescription = audioNotificationDescription,
-        videoNotificationDescription = videoNotificationDescription
+      val notificationIcon =  data.getString("notificationIcon") ?: ""
+      val prefix = data?.getString("prefix")  ?: ""
+      val incomingBackgroundColor = data?.getString("incomingBackgroundColor") ?: ""
+      val incomingAcceptButtonImage = data?.getString("incomingAcceptButtonImage") ?: ""
+      val incomingDeclineButtonImage = data?.getString("incomingDeclineButtonImage") ?: ""
+      val prefixMissedCallMessage = data?.getString("prefixMissedCallMessage") ?: ""
+      val backImage = data?.getString("backImage") ?: ""
+      val userImage = data?.getString("userImage") ?: ""
+      val userNameKey = data?.getString("userNameKey") ?: ""
+      val channelId = data?.getString("channelId") ?: ""
+      val missedCallTitle = data?.getString("missedCallTitle") ?: ""
+      val audioNotificationDescription = data?.getString("audioNotificationDescription") ?: ""
+      val videoNotificationDescription = data?.getString("videoNotificationDescription") ?: ""
+      val displayNameType = data?.getString("displayNameType") ?: ""
+
+      OmiClient.getInstance(reactApplicationContext!!).configPushNotification(
+        showMissedCall = true,
+        notificationIcon = notificationIcon ?: "ic_notification",
+        notificationAvatar = userImage ?: "ic_inbound_avatar_notification",
+        fullScreenAvatar = userImage ?: "ic_inbound_avatar_fullscreen",
+        internalCallText = "Gọi nội bộ",
+        videoCallText = "Gọi Video",
+        inboundCallText = prefix,
+        unknownContactText = "Cuộc gọi không xác định",
+        showUUID = false,
+        inboundChannelId =  "${channelId}-inbound",
+        inboundChannelName = "Cuộc gọi đến",
+        missedChannelId =  "${channelId}-missed",
+        missedChannelName = "Cuộc gọi nhỡ",
+        displayNameType = userNameKey ?: "full_name",
+        notificationMissedCallPrefix = prefixMissedCallMessage ?: "Cuộc gọi nhỡ từ"
       )
       promise.resolve(true)
     }
@@ -222,20 +269,17 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   fun initCallWithUserPassword(data: ReadableMap, promise: Promise) {
     currentActivity?.runOnUiThread {
       val userName = data.getString("userName")
-      val password = data.getString("password")
-      val realm = data.getString("realm")
-      val host = data.getString("host")
-      val isVideo = data.getBoolean("isVideo")
-      if (userName != null && password != null && realm != null && host != null) {
-        OmiClient.register(
-          userName,
-          password,
-          realm,
-          isVideo,
-          host,
-        )
-      }
-      requestPermission(isVideo)
+          Log.d("dataOmi", "INIT_CALL_USER_PASSWORD  ==>> $data ")
+      Log.d("dataOmi", "INIT_CALL_USER_PASSWORD  ==>> $userName ")
+       val password = data.getString("password")
+       val realm = data.getString("realm")
+       val host = data.getString("host")
+       val isVideo = data.getBoolean("isVideo")
+       if (userName != null && password != null && realm != null && host != null) {
+         Log.d("dataOmi", "INIT_CALL_USER_PASSWORD $userName -- $password --$realm --$isVideo -- $host ")
+         OmiClient.register(userName, password, realm ,  isVideo ?: true,  host)
+       }
+//       requestPermission(isVideo ?: true)
       promise.resolve(true)
     }
   }
@@ -249,6 +293,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val apiKey = data.getString("apiKey")
       val isVideo = data.getBoolean("isVideo")
       val phone = data.getString("phone")
+
       withContext(Dispatchers.Default) {
         try {
           if (usrName != null && usrUuid != null && apiKey != null) {
@@ -273,7 +318,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun getInitialCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      val call = OmiClient.instance.getCurrentCallInfo()
+      val call = OmiClient.getInstance(reactApplicationContext!!).getCurrentCallInfo()
       if (call != null) {
         val map: WritableMap = WritableNativeMap()
         map.putString("callerNumber", call["callerNumber"] as String)
@@ -293,7 +338,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val deviceTokenAndroid = data.getString("fcmToken") as String
       withContext(Dispatchers.Default) {
         try {
-          OmiClient.instance.updatePushToken(
+          OmiClient.getInstance(reactApplicationContext!!).updatePushToken(
             "",
             deviceTokenAndroid,
           )
@@ -312,14 +357,25 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         reactApplicationContext!!,
         Manifest.permission.RECORD_AUDIO
       )
+    val map: WritableMap = WritableNativeMap()
     if (audio == PackageManager.PERMISSION_GRANTED) {
       currentActivity?.runOnUiThread {
         val phoneNumber = data.getString("phoneNumber") as String
         val isVideo = data.getBoolean("isVideo")
-        OmiClient.instance.startCall(phoneNumber, isVideo)
+        val startCallResult =   OmiClient.getInstance(reactApplicationContext!!).startCall(phoneNumber, isVideo)
+        Log.d("dataOmi", "startCall  ==>> ${startCallResult} ")
+        Log.d("dataOmi", "startCall2  ==>> ${startCallResult.value} ")
+//        var status = startCallResult.value as String
+        //  map.putString("status", startCallResult)
+         map.putString("_id", "")
+          // map.putString("message", startCallResult as String)
+         Log.d("dataOmi", "startCall  ==>> ${map} ")
         promise.resolve(true)
       }
     } else {
+      map.putString("status","4")
+      map.putString("_id", "")
+      map.putString("message", messageCall(4) as String)
       promise.resolve(false)
     }
   }
@@ -338,7 +394,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           try {
             val uuid = data.getString("usrUuid") as String
             val isVideo = data.getBoolean("isVideo")
-            callResult = OmiClient.instance.startCallWithUuid(uuid = uuid, isVideo = isVideo)
+            callResult = OmiClient.getInstance(reactApplicationContext!!).startCallWithUuid(uuid = uuid, isVideo = isVideo)
           } catch (_: Throwable) {
 
           }
@@ -353,7 +409,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun joinCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      OmiClient.instance.pickUp()
+      OmiClient.getInstance(reactApplicationContext!!).pickUp()
       promise.resolve(true)
     }
   }
@@ -361,7 +417,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun endCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      val call = OmiClient.instance.hangUp()
+      val call = OmiClient.getInstance(reactApplicationContext!!).hangUp()
       val map: WritableMap = WritableNativeMap()
       val timeStartToAnswer = call?.get("time_start_to_answer") as Long?
       val timeEnd = call?.get("time_end") as Long
@@ -383,7 +439,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       var newStatus: Boolean? = null
       withContext(Dispatchers.Default) {
         try {
-          newStatus = OmiClient.instance.toggleMute()
+          newStatus = OmiClient.getInstance(reactApplicationContext!!).toggleMute()
         } catch (_: Throwable) {
 
         }
@@ -396,7 +452,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun toggleSpeaker(promise: Promise) {
     currentActivity?.runOnUiThread {
-      val newStatus = OmiClient.instance.toggleSpeaker()
+      val newStatus = OmiClient.getInstance(reactApplicationContext!!).toggleSpeaker()
       promise.resolve(newStatus)
       sendEvent(SPEAKER, newStatus)
     }
@@ -414,7 +470,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         characterCode = 11
       }
       if (characterCode != null) {
-        OmiClient.instance.sendDtmf(characterCode)
+        OmiClient.getInstance(reactApplicationContext!!).sendDtmf(characterCode)
       }
       promise.resolve(true)
     }
@@ -423,7 +479,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun switchOmiCamera(promise: Promise) {
     currentActivity?.runOnUiThread {
-      OmiClient.instance.switchCamera()
+      OmiClient.getInstance(reactApplicationContext!!).switchCamera()
       promise.resolve(true)
     }
   }
@@ -431,7 +487,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun toggleOmiVideo(promise: Promise) {
     currentActivity?.runOnUiThread {
-      OmiClient.instance.toggleCamera()
+      OmiClient.getInstance(reactApplicationContext!!).toggleCamera()
       promise.resolve(true)
     }
   }
@@ -441,7 +497,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     mainScope.launch {
       withContext(Dispatchers.Default) {
         try {
-          OmiClient.instance.logout()
+          OmiClient.getInstance(reactApplicationContext!!).logout()
         } catch (_: Throwable) {
 
         }
@@ -456,7 +512,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       var callResult: Any? = null
       withContext(Dispatchers.Default) {
         try {
-          callResult = OmiClient.instance.getCurrentUser()
+          callResult = OmiClient.getInstance(reactApplicationContext!!).getCurrentUser()
         } catch (_: Throwable) {
 
         }
@@ -481,7 +537,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       var callResult: Any? = null
       withContext(Dispatchers.Default) {
         try {
-          callResult = OmiClient.instance.getIncomingCallUser()
+          callResult = OmiClient.getInstance(reactApplicationContext!!).getIncomingCallUser()
         } catch (_: Throwable) {
 
         }
@@ -506,7 +562,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       var callResult: Any? = null
       withContext(Dispatchers.Default) {
         try {
-          callResult = OmiClient.instance.getUserInfo(phone as String)
+          callResult = OmiClient.getInstance(reactApplicationContext!!).getUserInfo(phone as String)
         } catch (_: Throwable) {
         }
       }
@@ -526,7 +582,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun getAudio(promise: Promise) {
-    val inputs = OmiClient.instance.getAudioOutputs()
+    val inputs = OmiClient.getInstance(reactApplicationContext!!).getAudioOutputs()
     val writeList = WritableNativeArray()
     inputs.forEach {
       val map = WritableNativeMap()
@@ -539,7 +595,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun getCurrentAudio(promise: Promise) {
-    val currentAudio = OmiClient.instance.getCurrentAudio()
+    val currentAudio = OmiClient.getInstance(reactApplicationContext!!).getCurrentAudio()
     val map: WritableMap = WritableNativeMap()
     map.putString("name", currentAudio["name"] as String)
     map.putInt("type", currentAudio["type"] as Int)
@@ -551,7 +607,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun setAudio(data: ReadableMap, promise: Promise) {
     val portType = data.getInt("portType")
-    OmiClient.instance.setAudio(portType)
+    OmiClient.getInstance(reactApplicationContext!!).setAudio(portType)
     promise.resolve(true)
   }
 

package/android/src/main/java/com/omikitplugin/state/CallState.kt

@@ -1,12 +1,13 @@
 package com.omikitplugin.state
 
 enum class CallState(_value: Int) {
-  calling(0),
-  early(1),
-  connecting(2),
-  confirmed(3),
-  incoming(4),
-  disconnected(5);
+    unknown(0),
+    calling(1),
+    incoming(2),
+    early(3),
+    connecting(4),
+    confirmed(5),
+    disconnected(6);
 
   val value = _value
 }