omikit-plugin 3.0.4 → 3.0.5

package/android/build.gradle

@@ -107,7 +107,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   // implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-  api 'vn.vihat.omicall:omi-sdk:2.0.19'
+  api 'vn.vihat.omicall:omi-sdk:2.0.23'
 //    implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    implementation files('OmiSDK.aar')
   implementation "com.google.android.flexbox:flexbox:3.0.0"
@@ -119,7 +119,7 @@ dependencies {
     exclude module: 'okhttp'
   }
   implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-  implementation "com.squareup.okhttp3:okhttp:4.9.1"
+  implementation "com.squareup.okhttp3:okhttp:4.9.1"  
   implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1"
   implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
   implementation "com.google.code.gson:gson:2.8.9"

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

@@ -45,6 +45,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
     isIncomming = true;
+       Log.d("OMISDK", "=>> START IN COMMING CALL REVICED => ")
     val map: WritableMap = WritableNativeMap()
     map.putBoolean("isVideo", isVideo ?: true)
     map.putBoolean("incoming", isIncomming)
@@ -63,6 +64,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     transactionId: String?,
   ) {
     isAnserCall = true
+    Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
     Handler(Looper.getMainLooper()).postDelayed({
       Log.d("OmikitReactNative", "onCallEstablished")
       val map: WritableMap = WritableNativeMap()
@@ -72,10 +74,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       map.putString("transactionId", transactionId)
       map.putInt("status", CallState.confirmed.value)
       sendEvent(CALL_STATE_CHANGED, map)
-    }, 500)
+    }, 200)
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
+      Log.d("OMISDK", "=>> ON CALL END => ")
     val call = callInfo as Map<*, *>
     val map: WritableMap = WritableNativeMap()
     val timeStartToAnswer = call["time_start_to_answer"] as Long?
@@ -93,6 +96,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onConnecting() {
+    Log.d("OMISDK", "=>> ON CONNECTING CALL => ")
     val map: WritableMap = WritableNativeMap()
     map.putString("callerNumber", "")
     map.putBoolean("isVideo", NotificationService.isVideo)
@@ -108,6 +112,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     val map: WritableMap = WritableNativeMap()
 
     if(callDirection == "inbound") {
+       Log.d("OMISDK", "=>> ON IN COMMING CALL => ")
       map.putString("callerNumber", OmiClient.prePhoneNumber)
       map.putBoolean("isVideo", NotificationService.isVideo)
       map.putBoolean("incoming", true)
@@ -119,6 +124,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       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)
   }
@@ -149,6 +155,7 @@ 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)
@@ -369,13 +376,14 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         //  map.putString("status", startCallResult)
          map.putString("_id", "")
           // map.putString("message", startCallResult as String)
-         Log.d("dataOmi", "startCall  ==>> ${map} ")
+      Log.d("OMISDK", "=>> ON START CALL =>  $map")
         promise.resolve(true)
       }
     } 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(false)
     }
   }
@@ -409,28 +417,22 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun joinCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      OmiClient.getInstance(reactApplicationContext!!).pickUp()
-      promise.resolve(true)
+      if(reactApplicationContext != null) {
+          OmiClient.getInstance(reactApplicationContext!!).pickUp()
+          promise.resolve(true)
+      }
     }
   }
 
   @ReactMethod
   fun endCall(promise: Promise) {
-    currentActivity?.runOnUiThread {
-      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
-      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)
-      promise.resolve(map)
-    }
+    if(isIncomming && !isAnserCall){
+        OmiClient.getInstance(reactApplicationContext!!).decline()
+    } else {
+      OmiClient.getInstance(reactApplicationContext!!).hangUp()
+    }  
+      promise.resolve(true)
+    
   }
 
   @ReactMethod

package/package.json

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