omikit-plugin 2.1.3 → 2.2.1

package/README.md

@@ -32,8 +32,9 @@ yarn add omikit-plugin --latest
 #### Android:
 
 - Add these settings in `build.gradle`:
+
 ```
-jcenter() 
+jcenter()
 maven {
     url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
     credentials {
@@ -42,10 +43,12 @@ maven {
     }
 }
 ```
+
 ```
 //in dependencies
 classpath 'com.google.gms:google-services:4.3.13'
 ```
+
 ```
 //under buildscript
 allprojects {
@@ -81,15 +84,16 @@ allprojects {
 You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blob/main/example/android/build.gradle">android/build.gradle</a> to know more informations.
 
 - Add these settings in `app/build.gradle`:
+
 ```
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 ```
 
 You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blob/main/example/android/app/build.gradle">android/app/build.gradle</a> to know more informations.
 
 - Update AndroidManifest.xml:
+
 ```
 //need request this permission
 <uses-permission android:name="android.permission.INTERNET" />
@@ -99,18 +103,20 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
     <category android:name="android.intent.category.DEFAULT" />
 </intent-filter>
 //add this lines outside <activity>
-<service
-    android:name="vn.vihat.omicall.omisdk.service.FMService"
-    android:exported="false">
-    <intent-filter>
-        <action android:name="com.google.firebase.MESSAGING_EVENT" />
-    </intent-filter>
-</service>
+<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>
 ```
 
 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.
 
 - We registered permissions into my plugin:
+
 ```
 <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"
     tools:ignore="ProtectedPermissions" />
@@ -131,13 +137,15 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
 ```
 
 - Setup remote push notification: Only support Firebase for remote push notification.
+
   - Add `google-service.json` in `android/app` (For more information, you can refer <a href="https://rnfirebase.io/app/usage">Core/App</a>)
   - Add Fire Messaging to receive `fcm_token` (You can refer <a href="https://rnfirebase.io/messaging/usage">Cloud Messaging</a> to setup notification for React native)
 
-  - For more setting information, please refer <a href="https://rnfirebase.io/messaging/usage">Config Push for Android</a>
+  - For more setting information, please refer <a href="https://api.omicall.com/web-sdk/mobile-sdk/android-sdk/cau-hinh-push-notification">Config Push for Android</a>
 
 #### iOS:
-----
+
+---
 
 We support both Object-C and Swift. But we only support documents for Object-C. We will write for Swift language later. Thank you.
 
@@ -150,11 +158,15 @@ We support both Object-C and Swift. But we only support documents for Object-C.
 #import <UserNotifications/UserNotifications.h>
 #import <OmiKit/OmiKit-umbrella.h>
 #import <OmiKit/Constants.h>
-#import <UserNotifications/UserNotifications.h>
 
-PushKitManager *pushkitManager;
-CallKitProviderDelegate * provider;
-PKPushRegistry * voipRegistry;
+@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate, UNUserNotificationCenterDelegate>
+
+@property (nonatomic, strong) UIWindow *window;
+@property (nonatomic, strong) PushKitManager *pushkitManager;
+@property (nonatomic, strong) CallKitProviderDelegate * provider;
+@property (nonatomic, strong) PKPushRegistry * voipRegistry;
+
+@end
 ```
 
 - Edit AppDelegate.m:
@@ -167,9 +179,28 @@ PKPushRegistry * voipRegistry;
 provider = [[CallKitProviderDelegate alloc] initWithCallManager: [OMISIPLib sharedInstance].callManager];
 voipRegistry = [[PKPushRegistry alloc] initWithQueue:dispatch_get_main_queue()];
 pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
+if (@available(iOS 10.0, *)) {
+      [UNUserNotificationCenter currentNotificationCenter].delegate = (id<UNUserNotificationCenterDelegate>) self;
+}
+
+//Called when a notification is delivered to a foreground app.
+-(void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
+{
+  NSLog(@"User Info : %@",notification.request.content.userInfo);
+  completionHandler(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge);
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler {
+    NSDictionary *userInfo  = response.notification.request.content.userInfo;
+    if (userInfo && [userInfo valueForKey:@"omisdkCallerNumber"]) {
+      NSLog(@"User Info : %@",userInfo);
+      [OmikitNotification didRecieve:userInfo];
+    }
+    completionHandler();
+}
 ```
 
--  Add these lines into `Info.plist`:
+- Add these lines into `Info.plist`:
 
 ```
 <key>NSMicrophoneUsageDescription</key>
@@ -191,15 +222,18 @@ pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
     {
         [token appendFormat:@"%02.2hhX", data[i]];
     }
-    
+
     // print the token in the console.
     NSLog(@"Push Notification Token: %@", [token copy]);
     [OmiClient setUserPushNotificationToken:[token copy]];
 }
 
 ```
-*** Only use under lines when added `Cloud Messaging` plugin in your project ***
+
+**_ Only use under lines when added `Cloud Messaging` plugin in your project _**
+
 - Setup push notification: We only support Firebase for push notification.
+
   - Add `google-service.json` in `android/app` (For more information, you can refer <a href="https://rnfirebase.io/app/usage">Core/App</a>)
   - Add Firebase Messaging to receive `fcm_token` (You can refer <a href="https://pub.dev/packages/firebase_messaging">Cloud Messaging</a> to setup notification for React Native)
 
@@ -214,18 +248,23 @@ pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
 //because we use APNS to push notification on iOS so you don't need add Firebase for iOS.
 //But you can use firebase-messaging to get APNS token for iOS.
 ```
+
 - Important function.
+
   - Start Serivce: OmiKit need start services and register some events.
+
     ```
     //Call in the root widget
     import { startServices } from 'omikit-plugin';
-    
+
     startServices();
     ```
+
   - Create OmiKit With ApiKey: OmiKit need apikey, username, user id to init enviroment. ViHAT Group will provide api key for you. Please contact for my sale:
+
     ```
     import { initCallWithApiKey } from 'omikit-plugin';
-    
+
     const loginInfo = {
       usrUuid: usrUuid,
       fullName: fullName,
@@ -236,10 +275,12 @@ pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
     const result = await initCallWithApiKey(loginInfo);
     //result is true then user login successfully.
     ```
+
   - 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';
-    
+
     const loginInfo = {
       userName: userName, //string
       password: password, //string
@@ -250,38 +291,45 @@ pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
     const result = await initCall(loginInfo);
     //result is true then user login successfully.
 ```
-  - Config push notification for Android:
-    ```
-    import { configPushNotification } from 'omikit-plugin';
-    
-    configPushNotification({
-        prefix: 'Cuộc gọi tới từ: ',
-        declineTitle: 'Từ chối',
-        acceptTitle: 'Chấp nhận',
-        acceptBackgroundColor: '#FF3700B3',
-        declineBackgroundColor: '#FF000000',
-        incomingBackgroundColor: '#FFFFFFFF',
-        incomingAcceptButtonImage: 'join_call',
-        incomingDeclineButtonImage: 'hangup',
-        backImage: 'ic_back',
-        userImage: 'calling_face',
-      });
-    //incomingAcceptButtonImage, incomingDeclineButtonImage, backImage, userImage: Add these into `android/app/src/main/res/drawble`
-    ```
-  - Get call when user open app from killed status(only iOS):
-    ```
-    import { getInitialCall } from 'omikit-plugin';
-    
-    const callingInfo = await getInitialCall();
-    if (callingInfo !== false) {
-      navigation.navigate('DialCall' as never, callingInfo as never);
-    }
-    //callingInfo != false then user have a calling.
-    ```
+
+- Config push notification:
+
+  ```
+  import { configPushNotification } from 'omikit-plugin';
+
+  configPushNotification({
+    prefix : "Cuộc gọi tới từ: ",
+    declineTitle : "Từ chối",
+    acceptTitle : "Chấp nhận",
+    acceptBackgroundColor : "#FF3700B3",
+    declineBackgroundColor : "#FF000000",
+    incomingBackgroundColor : "#FFFFFFFF",
+    incomingAcceptButtonImage : "join_call", //image name
+    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
+  });
+  //incomingAcceptButtonImage, incomingDeclineButtonImage, backImage, userImage: Add these into `android/app/src/main/res/drawble`
+  ```
+
+- Get call when user open app from killed status(only iOS):
+
+  ```
+  import { getInitialCall } from 'omikit-plugin';
+
+  const callingInfo = await getInitialCall();
+  if (callingInfo !== false) {
+    navigation.navigate('DialCall' as never, callingInfo as never);
+  }
+  //callingInfo != false then user have a calling.
+  ```
+
 - Upload token: OmiKit need FCM for Android and APNS to push notification on user devices. We use more packages: <a href="https://rnfirebase.io/messaging/usage">Cloud Messaging</a> and <a href="https://www.npmjs.com/package/react-native-device-info?activeTab=readme">react-native-device-info</a>
+
   ```
   import { updateToken } from 'omikit-plugin';
-  
   const fcmToken = await fcm;
   const apnsToken = await apns;
   const deviceId = DeviceInfo.getDeviceId();
@@ -293,103 +341,179 @@ pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
     appId: appId,
   });
   ```
+
 - Other functions:
-  -  Call with phone number (mobile phone or internal number):
-    ```
-    import {startCall} from 'omikit-plugin';
-    
-    const result = await startCall({ 
-        phoneNumber: phone, //phone number
-        isVideo: false //allow video call: true/false
-    });
-    ```
-  -  Call with UUID (only support with Api key):
-    ```
-    import {startCallWithUuid} from 'omikit-plugin';
-    
-    const result = await startCallWithUuid({ 
-        usrUuid: uuid, //phone number
-        isVideo: false //allow video call: true/false
-    });
-    ```
+
+  - Call with phone number (mobile phone or internal number):
+
+  ```
+  import {startCall} from 'omikit-plugin';
+  const result = await startCall({
+      phoneNumber: phone, //phone number
+      isVideo: false //allow video call: true/false
+  });
+  ```
+
+  - Call with UUID (only support with Api key):
+
+  ```
+  import {startCallWithUuid} from 'omikit-plugin';
+  const result = await startCallWithUuid({
+      usrUuid: uuid, //phone number
+      isVideo: false //allow video call: true/false
+  });
+  ```
+
   - Accept a call:
+
     ```
     import {joinCall} from 'omikit-plugin';
-    
+
     await joinCall();
     ```
+
   - End a call: We will push a event `endCall` for you.
+
     ```
     import {endCall} from 'omikit-plugin';
-    
-    await endCall();
+
+    const value = await endCall();
+    //value is call information
+    Sample output:
+    {
+       "transaction_id":ea7dff38-cb1e-483d-8576...........,
+       "direction":"inbound",
+       "source_number":111,
+       "destination_number":110,
+       "time_start_to_answer":1682858097393,
+       "time_end":1682858152181,
+       "sip_user":111,
+       "disposition":"answered"
+    }
     ```
+
   - Toggle the audio: On/off audio a call
+
     ```
     import {toggleMute} from 'omikit-plugin';
-    
+
     toggleMute();
     ```
+
   - Toggle the speaker: On/off the phone speaker
+
     ```
     import {toggleSpeaker} from 'omikit-plugin';
-    
+
     toggleSpeaker();
     ```
+
   - Send character: We only support `1 to 9` and `* #`.
+
     ```
     import {sendDTMF} from 'omikit-plugin';
-    
+
     sendDTMF({
         character: text,
     });
     ```
+
+  - Get current user information:
+    ```
+    final user = await getCurrentUser();
+    Output Sample:
+    {
+        "extension": "111",
+        "full_name": "chau1",
+        "avatar_url": "",
+        "uuid": "122aaa"
+    }
+    ```
+  - Get guest user information:
+    ```
+    final user = await getGuestUser();
+    Output Sample:
+    {
+        "extension": "111",
+        "full_name": "chau1",
+        "avatar_url": "",
+        "uuid": "122aaa"
+    }
+    ```
+  - Get user information from sip:
+
+    ```
+    final user = await getUserInfo("111");
+    Output Sample:
+    {
+        "extension": "111",
+        "full_name": "chau1",
+        "avatar_url": "",
+        "uuid": "122aaa"
+    }
+    ```
+
   - Logout: Can't receive call.
+
     ```
     import {logout} from 'omikit-plugin';
-    
+
     logout();
     ```
-    
+
 - Video Call functions: Support only video call, You need enable video in `init functions` and `start call` to implements under functions.
+
   - Switch front/back camera: We use the front camera for first time.
+
   ```
   import {switchOmiCamera} from 'omikit-plugin';
   switchOmiCamera();
   ```
+
   - Toggle a video in video call: On/off video in video call
+
   ```
   import {toggleOmiVideo} from 'omikit-plugin';
   toggleOmiVideo();
   ```
+
   - Local Camera Widget: Your camera view in a call
+
   ```
   import { OmiLocalCameraView } from 'omikit-plugin';
   <OmiLocalCameraView style={styles.localCamera} />
   ```
+
   - Remote Camera Widget: Remote camera view in a call
+
   ```
   import { OmiRemoteCameraView } from 'omikit-plugin';
   <OmiRemoteCameraView style={styles.remoteCamera} />
   ```
+
   - More function: Refresh local camera
+
   ```
   import {refreshLocalCamera} from 'omikit-plugin';
   refreshLocalCamera();
   ```
+
   - More function: Refresh remote camera
+
   ```
   import {refreshRemoteCamera} from 'omikit-plugin';
   refreshRemoteCamera();
   ```
+
   - Register event: Register remote video ready: only visible on iOS
+
   ```
   import {registerVideoEvent} from 'omikit-plugin';
   registerVideoEvent();
   ```
 
-
 - Event listener:
+
 ```
 useEffect(() => {
     omiEmitter.addListener(OmiCallEvent.incomingReceived, incomingReceived);
@@ -397,6 +521,7 @@ useEffect(() => {
     omiEmitter.addListener(OmiCallEvent.onCallEnd, onCallEnd);
     omiEmitter.addListener(OmiCallEvent.onMuted, onMuted);
     omiEmitter.addListener(OmiCallEvent.onSpeaker, onSpeaker);
+    omiEmitter.addListener(OmiCallEvent.onClickMissedCall, clickMissedCall);
     if (Platform.OS === 'ios') {
       registerVideoEvent();
       omiEmitter.addListener(
@@ -417,10 +542,12 @@ useEffect(() => {
     };
 }, []);
 ```
-- Action Name value: 
-    - `OmiCallEvent.incomingReceived`: Have a incoming call. On Android this event work only foreground
-    - `OmiCallEvent.onCallEstablished`: Connected a call.
-    - `OmiCallEvent.onCallEnd`: End a call.
-    - `OmiCallEvent.onMuted`: Audio changed.
-    - `OmiCallEvent.onSpeaker`: Audio changed.
+
+- Action Name value:
+  - `OmiCallEvent.incomingReceived`: Have a incoming call. On Android this event work only foreground
+  - `OmiCallEvent.onCallEstablished`: Connected a call.
+  - `OmiCallEvent.onCallEnd`: End a call and return call information (like endCall)
+  - `OmiCallEvent.onMuted`: Audio changed.
+  - `OmiCallEvent.onSpeaker`: Audio changed.
+  - `OmiCallEvent.onClickMissedCall`: Click missed call notification.
 - Data value: We return `callerNumber`, `isVideo: true/false` information

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.1.0'
+  api 'vn.vihat.omicall:omi-sdk:1.1.24'
 
   implementation 'androidx.core:core-ktx:1.7.0'
   implementation 'androidx.fragment:fragment-ktx:1.4.0'
@@ -119,6 +119,7 @@ dependencies {
   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 "androidx.security:security-crypto:1.1.0-alpha06"
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -2,6 +2,7 @@ package com.omikitplugin
 
 import android.view.Surface
 import android.view.TextureView
+import android.widget.LinearLayout
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -13,7 +14,8 @@ import vn.vihat.omicall.omisdk.videoutils.Size
 class FLLocalCameraModule(reactContext: ReactApplicationContext, localViewManager: FLLocalCameraView) :
   ReactContextBaseJavaModule(reactContext) {
 
-  var cameraView: TextureView
+  var cameraView: LinearLayout
+  lateinit var localViewManager : FLLocalCameraView
 
   override fun getName(): String {
     return "FLLocalCameraView"
@@ -21,17 +23,12 @@ class FLLocalCameraModule(reactContext: ReactApplicationContext, localViewManage
 
   init {
     cameraView = localViewManager.localView
+    this.localViewManager = localViewManager
   }
 
   @ReactMethod
   fun refresh(promise: Promise) {
-    cameraView.surfaceTexture?.let {
-      OmiClient.instance.setupLocalVideoFeed(Surface(it))
-      ScaleManager.adjustAspectRatio(cameraView,
-        Size(cameraView.width, cameraView.height),
-        Size(1280,720)
-      )
-      promise.resolve(true)
-    }
+    this.localViewManager.refreshTexture()
+    promise.resolve(true)
   }
 }

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

@@ -1,23 +1,44 @@
 package com.omikitplugin
 
+import android.view.Surface
 import android.view.TextureView
+import android.widget.LinearLayout
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
+import vn.vihat.omicall.omisdk.OmiClient
+import vn.vihat.omicall.omisdk.videoutils.ScaleManager
+import vn.vihat.omicall.omisdk.videoutils.Size
 
 class FLLocalCameraView(private val context: ReactApplicationContext) :
-  SimpleViewManager<TextureView>() {
-  val localView : TextureView = TextureView(context)
+  SimpleViewManager<LinearLayout>() {
+  val localView : LinearLayout = LinearLayout(context)
+  private val cameraView : TextureView = TextureView(context)
+
+  init {
+      localView.addView(cameraView)
+  }
 
   override fun getName(): String {
     return "FLLocalCameraView"
   }
 
-  override fun createViewInstance(p0: ThemedReactContext): TextureView {
+  override fun createViewInstance(p0: ThemedReactContext): LinearLayout {
     return localView
   }
 
-  fun localViewInstance(): TextureView {
+  fun localViewInstance(): LinearLayout {
     return localView
   }
+
+  fun refreshTexture() {
+      cameraView.surfaceTexture?.let {
+        OmiClient.instance.setupLocalVideoFeed(Surface(it))
+        ScaleManager.adjustAspectRatio(
+          cameraView,
+          Size(cameraView.width, cameraView.height),
+          Size(1280, 720)
+        )
+      }
+  }
 }