omikit-plugin 3.2.38 → 3.2.39

package/README.md

@@ -36,16 +36,25 @@ yarn add omikit-plugin --latest
 ```
 jcenter()
 maven {
-    url "https://maven.pkg.github.com/omicall/OMICall-SDK"
-    credentials {
-      username = "omicall"
-      password = "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"
-    }
-    authentication {
-        basic(BasicAuthentication)
-    }
+  url "https://maven.pkg.github.com/omicall/OMICall-SDK"
+  credentials {
+      username = project.findProperty("OMI_USER") ?: ""
+      password = project.findProperty("OMI_TOKEN") ?: ""
+  }
+  authentication {
+      basic(BasicAuthentication)
+  }
+}
+
+dependencies {
+ api 'vn.vihat.omicall:omi-sdk:2.2.85'
 }
 ```
+```
+// gradle.properties
+OMI_USER=omicall
+OMI_TOKEN=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
+```
 
 ```
 // in dependencies
@@ -73,15 +82,15 @@ allprojects {
         }
         google()
         maven { url 'https://www.jitpack.io' }
-        maven {
-            url "https://maven.pkg.github.com/omicall/OMICall-SDK"
-            credentials {
-                username = "omicall"
-                password = "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"
-            }
-            authentication {
-                basic(BasicAuthentication)
-            }
+       maven {
+          url "https://maven.pkg.github.com/omicall/OMICall-SDK"
+          credentials {
+              username = project.findProperty("OMI_USER") ?: ""
+              password = project.findProperty("OMI_TOKEN") ?: ""
+          }
+          authentication {
+              basic(BasicAuthentication)
+          }
         }
       }
 }

package/android/build.gradle

@@ -85,8 +85,8 @@ allprojects {
     maven {
             url "https://maven.pkg.github.com/omicall/OMICall-SDK"
             credentials {
-                username = "omicall"
-                password = "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"
+                username = project.findProperty("OMI_USER") ?: ""
+                password = project.findProperty("OMI_TOKEN") ?: ""
             }
             authentication {
                 basic(BasicAuthentication)
@@ -103,7 +103,7 @@ dependencies {
   // use for OMISDK
   implementation("androidx.work:work-runtime:2.8.1")
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
-  api 'vn.vihat.omicall:omi-sdk:2.2.85'
+  api 'vn.vihat.omicall:omi-sdk:2.3.12'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

package/android/gradle.properties

@@ -3,3 +3,5 @@ OmikitPlugin_minSdkVersion=24
 OmikitPlugin_targetSdkVersion=33
 OmikitPlugin_compileSdkVersion=33
 OmikitPlugin_ndkversion=21.4.7075529
+OMI_USER=omicall
+OMI_TOKEN=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

package/android/settings.gradle

@@ -16,8 +16,8 @@ dependencyResolutionManagement {
         maven {
             url "https://maven.pkg.github.com/omicall/OMICall-SDK"
             credentials {
-                username = "omicall"
-                password = "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"
+                username = project.findProperty("OMI_USER") ?: ""
+                password = project.findProperty("OMI_TOKEN") ?: ""
             }
             authentication {
                 basic(BasicAuthentication)

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

@@ -303,24 +303,18 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     mainScope.launch {
       var loginResult = false
       val userName = data.getString("userName")
-      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") ?: "vh.omicrm.com"
       val isVideo = data.getBoolean("isVideo")
-      val firebaseToken = data.getString("fcmToken")
-
-      Log.d(
-        "dataOmi",
-        "INIT_CALL_USER_PASSWORD $userName -- $password --$realm --$isVideo -- $host"
-      )
+      val firebaseToken = data.getString("fcmToken")  
+      val projectId = data.getString("projectId") ?: ""
 
       withContext(Dispatchers.Default) {
         try {
           if (userName != null && password != null && realm != null && firebaseToken != null) {
             loginResult =
-              OmiClient.register(userName, password, realm, isVideo ?: true, firebaseToken, host)
+              OmiClient.register(userName, password, realm, isVideo ?: true, firebaseToken, host, projectId)
             promise.resolve(loginResult)
           }
         } catch (_: Throwable) {
@@ -341,6 +335,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val isVideo = data.getBoolean("isVideo") ?: false
       val phone = data.getString("phone")
       val firebaseToken = data.getString("fcmToken") as String
+      val projectId = data.getString("projectId") ?: ""
+
       requestPermission(isVideo)
       withContext(Dispatchers.Default) {
         try {
@@ -351,7 +347,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
               uuid = usrUuid,
               phone = phone ?: "",
               isVideo = isVideo,
-              firebaseToken
+              firebaseToken,
+              projectId
             )
             promise.resolve(true)
           }
@@ -359,7 +356,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           promise.resolve(loginResult)
         }
       }
-
     }
   }
 

package/ios/CallProcess/CallManager.swift

@@ -132,6 +132,9 @@ class CallManager {
         //request permission
         var result = false
         if let usrUuid = params["usrUuid"] as? String, let fullName = params["fullName"] as? String, let apiKey = params["apiKey"] as? String, let token = params["fcmToken"] as? String {
+            if let projectID =  params["projectId"] as? String, !projectID.isEmpty {
+                OmiClient.setFcmProjectId(projectID)
+            }
             result = OmiClient.initWithUUID(usrUuid, fullName: fullName, apiKey: apiKey)
             OmiClient.setUserPushNotificationToken(token)
         }
@@ -146,6 +149,9 @@ class CallManager {
     func initWithUserPasswordEndpoint(params: [String: Any]) -> Bool {
         var result = false
         if let userName = params["userName"] as? String, let password = params["password"] as? String, let realm = params["realm"] as? String, let token = params["fcmToken"] as? String {
+            if let projectID =  params["projectId"] as? String, !projectID.isEmpty {
+                OmiClient.setFcmProjectId(projectID)
+            }
             OmiClient.initWithUsername(userName, password: password, realm: realm, proxy: "")
             OmiClient.setUserPushNotificationToken(token)
             result = true

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

package/package.json

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