omikit-plugin 3.2.19 → 3.2.23

package/README.md

@@ -101,27 +101,92 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
 - Update AndroidManifest.xml:
 
 ```
-//need request this permission
-//need request this permission
-<uses-permission android:name="android.permission.INTERNET" />
-//add these lines inside <activity>
-<intent-filter>
-    <action android:name="com.omicall.sdk.CallingActivity"/>
-    <category android:name="android.intent.category.DEFAULT" />
-</intent-filter>
-//add these lines outside <activity>
-<receiver
-    android:name="vn.vihat.omicall.omisdk.receiver.FirebaseMessageReceiver"
-    android:exported="true"
-    android:permission="com.google.android.c2dm.permission.SEND">
-    <intent-filter>
-        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-    </intent-filter>
-</receiver>
-<service
-    android:name="vn.vihat.omicall.omisdk.service.NotificationService"
-    android:exported="false">
-</service>
+<manifest 
+      ...... 
+      xmlns:tools="http://schemas.android.com/tools">
+      ..... // your config 
+      <uses-feature android:name="android.hardware.telephony" android:required="false" />
+      <uses-permission android:name="android.permission.INTERNET" />
+      <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+      <uses-permission android:name="android.permission.WAKE_LOCK" />
+      <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
+      <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA"/>
+      <uses-permission android:name="android.permission.CALL_PHONE"/>
+      ..... // your config 
+
+         <application
+                android:name=".MainApplication"
+                ...... // your config 
+                android:alwaysRetainTaskState="true"
+                android:largeHeap="true"
+                android:exported="true"
+                android:supportsRtl="true"
+                android:allowBackup="false"
+                android:enableOnBackInvokedCallback="true"
+                .....  // your config 
+        >
+                <activity
+                            android:name=".MainActivity"
+                        .....  // your config 
+                            android:windowSoftInputMode="adjustResize"
+                            android:showOnLockScreen="true"
+                            android:launchMode="singleTask"
+                            android:largeHeap="true"
+                            android:alwaysRetainTaskState="true"
+                            android:supportsPictureInPicture="false"
+                            android:showWhenLocked="true"
+                            android:turnScreenOn="true"
+                            android:exported="true"
+                        .....  // your config 
+                            >
+                        .....  // your config 
+                          <intent-filter>
+                              <action android:name="android.intent.action.MAIN" />
+                              <category android:name="android.intent.category.LAUNCHER" />
+                          </intent-filter>
+                          <intent-filter>
+                            <action 
+                                android:name="com.omicall.sdk.CallingActivity"
+                                android:launchMode="singleTask"
+                                android:largeHeap="true"
+                                android:alwaysRetainTaskState="true"
+                            />
+                            <category android:name="android.intent.category.DEFAULT" />
+                          </intent-filter>
+                        .....  // your config 
+                     </activity>
+                 .....  // your config 
+                <receiver
+                    android:name="vn.vihat.omicall.omisdk.receiver.FirebaseMessageReceiver"
+                    android:exported="true"
+                    android:enabled="true"
+                    tools:replace="android:exported"
+                    android:permission="com.google.android.c2dm.permission.SEND">
+                    <intent-filter>
+                        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                    </intent-filter>
+                </receiver>
+                <service
+                  android:name="vn.vihat.omicall.omisdk.service.NotificationService"
+                  android:enabled="true"
+                  android:exported="false">
+                </service>
+                 .....  // your config 
+           </application>
+</manifest>
+```
+
+# In file MainActivity:
+```
+public class MainActivity extends ReactActivity {
+   .....  // your config 
+  @Override
+  protected void onResume() {
+    super.onResume();
+    OmikitPluginModule.Companion.onResume(this);
+     .....  // your config 
+  }
+}
 ```
 
 You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blob/main/example/android/app/src/main/AndroidManifest.xml">AndroidManifest</a> to know more informations.
@@ -322,6 +387,22 @@ We support 2 environments. So you need set correct key in Appdelegate.
 
 ## Implement
 
+## Request permission
+```
+We need you request permission about call before make call:
+
+-Android: 
++ PERMISSIONS.ANDROID.RECORD_AUDIO
++ PERMISSIONS.ANDROID.CALL_PHONE
++ PERMISSIONS.ANDROID.CAMERA; (if you want to make Video calls)
+
+-IOS:
++ PERMISSIONS.IOS.MICROPHONE;
++ PERMISSIONS.IOS.CAMERA; (if you want to make Video calls)
+
+You can use react native permissions to do this
+```
+
 - Set up <a href="https://rnfirebase.io/messaging/usage">Cloud Messaging</a> plugin:
 
 ```
@@ -438,17 +519,31 @@ We support 2 environments. So you need set correct key in Appdelegate.
       phoneNumber: phone, //phone number
       isVideo: false //allow video call: true/false
   });
-  //we will return OmiStartCallStatus with:
-    - invalidUuid: uuid is invalid (we can not find on my page)
-    - invalidPhoneNumber: sip user is invalid.
-    - samePhoneNumber: Can not call same phone number.
-    - maxRetry: We try to refresh call but we can not start your call.
-    - permissionDenied: Check audio permission.
-    - couldNotFindEndpoint: Please login before make your call.
-    - accountRegisterFailed: We can not register your account.
-    - startCallFailed: We can not start you call.
-    - startCallSuccess: Start call successfully.
-    - haveAnotherCall: We can not start you call because you are joining another call.
+
+  // The result will be in the form of object:
+  
+  ```
+    result = {
+      "_id": String // This is call_id. it just have id for iOS,
+      "status": Number // This is result code when make,
+      "message": String // This is a string key, describing the status of the call
+    }
+  ```
+
+  ```
+  - Describe in detail the results when startCall returns:
+
+    + message="INVALID_UUID" (status = 0) : uid is invalid (we can not find on my page).
+    + message="INVALID_PHONE_NUMBER" (status = 1) : sip user is invalid.
+    + message="SAME_PHONE_NUMBER_WITH_PHONE_REGISTER" (status = 2) :  Can not call same phone number.
+    + message="MAX_RETRY" (status = 3) : call timeout exceeded, please try again later.
+    + message="PERMISSION_DENIED" (status = 4) : The user has not granted MIC or audio permissions.
+    + message="COULD_NOT_FIND_END_POINT" (status = 5) : Please login before make your call.
+    + message="REGISTER_ACCOUNT_FAIL" (status = 6) : Can't log in to OMI( maybe wrong login information).
+    + message="START_CALL_FAIL" (status = 7) : Call failed, please try again
+    + message="HAVE_ANOTHER_CALL" (status = 9) : There is another call in progress, please wait for that call to end
+    + message="START_CALL_SUCCESS" (status = 8) : Start call successfully.
+
   ```
 
   - Call with UUID (only support with Api key):
@@ -681,12 +776,22 @@ useEffect(() => {
               + callerNumber: phone number 
               + incoming: boolean - status call incoming or outgoing
               + _id: option (id of every call)
+              + code_end_call: This is code when end 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.
 
+- List of notable call codes `code_end_call`:
+  + 600, 503, 480 : These are the codes of the network operator or the user who did not answer the call
+  + 408: call request timeout (Each call usually has a waiting time of 30 seconds. If the 30 seconds expire, it will time out)
+  + 403: Your service plan only allows calls to dialed numbers. Please upgrade your service pack
+  + 404: The current number is not allowed to make calls to the carrier
+  + 603: The call was rejected. Please check your account limit or call barring configuration!
+  + 850: Simultaneous call limit exceeded, please try again later
+  + 486: The listener refuses the call and does not answer
+
 
 - Action Name value:
   - `OmiCallEvent.onMuted`: Audio changed.

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.72'
+  api 'vn.vihat.omicall:omi-sdk:2.1.45'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -124,9 +124,9 @@ dependencies {
   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"
-  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"

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

@@ -79,7 +79,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
-      Log.d("OMISDK", "=>> ON CALL END => ")
+      Log.d("OMISDK RN", "=>> onCallEnd 0000 => $callInfo")
     val call = callInfo as Map<*, *>
     val map: WritableMap = WritableNativeMap()
     val timeStartToAnswer = call["time_start_to_answer"] as Long?
@@ -93,6 +93,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     map.putString("sip_user", call["sip_user"] as String)
     map.putString("disposition", call["disposition"] as String)
     map.putInt("status", CallState.disconnected.value)
+    map.putInt("code_end_call", statusCode as Int)
+     Log.d("OMISDK RN", "=>> onCallEnd  => $map")
     sendEvent(CALL_STATE_CHANGED, map)
   }
 
@@ -220,7 +222,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     Handler(Looper.getMainLooper()).post {
       OmiClient.getInstance(reactApplicationContext!!).addCallStateListener(this)
       OmiClient.getInstance(reactApplicationContext!!).setDebug(false)
-      OmiClient.isAppReady = true;
     }
   }
 
@@ -364,12 +365,15 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
             }
           }
         } else {
-          val map: WritableMap = WritableNativeMap()
-          map.putString("callerNumber", call["callerNumber"] as String)
-          map.putInt("status", call["status"] as Int)
-          map.putBoolean("muted", call["muted"] as Boolean)
-          map.putBoolean("isVideo", call["isVideo"] as Boolean)
-          promise.resolve(map)
+          var phoneNumberTemp: String = call["callerNumber"]  as String
+          if(phoneNumberTemp.isNotEmpty()){
+            val map: WritableMap = WritableNativeMap()
+            map.putString("callerNumber", call["callerNumber"] as String)
+            map.putInt("status", call["status"] as Int)
+            map.putBoolean("muted", call["muted"] as Boolean)
+            map.putBoolean("isVideo", call["isVideo"] as Boolean)
+            promise.resolve(map)
+          }
         }
       }
     }
@@ -388,7 +392,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       currentActivity?.runOnUiThread {
         val phoneNumber = data.getString("phoneNumber") as String
         val isVideo = data.getBoolean("isVideo") ?: false ;
-        val startCallResult =   OmiClient.getInstance(reactApplicationContext!!).startCall(phoneNumber, isVideo)
+        val startCallResult =  OmiClient.getInstance(reactApplicationContext!!).startCall(phoneNumber, isVideo)
+         Log.d("OMISDK", "=>> startCallResult START CALL  =>  $startCallResult")
         var statusCalltemp =  startCallResult.value as Int;
         if(startCallResult.value == 200 ){
           statusCalltemp = 8
@@ -647,10 +652,20 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   companion object {
     const val NAME = "OmikitPlugin"
+ 
     fun onDestroy() {
 
     }
 
+   fun onResume(act: ReactActivity) {
+      act?.let { context ->
+        if (!OmiClient.getInstance(context).isRegistering) {
+            OmiClient.autoRegister(true);
+        } 
+        OmiClient.isAppReady = true;
+      }
+    }
+
     fun onRequestPermissionsResult(
       requestCode: Int,
       permissions: Array<out String>,

package/ios/CallProcess/CallManager.swift

@@ -358,6 +358,7 @@ class CallManager {
             "time_end" : timeEnd,
             "sip_user": user,
             "disposition" : lastStatusCall == nil ? "no_answered" : "answered",
+            "code_end_call" : call.lastStatus
         ]
     }
     

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.6.4'
+  s.dependency "OmiKit", '1.6.37'
 end 

package/package.json

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