omikit-plugin 3.2.53 → 3.2.54

package/README.md

@@ -700,7 +700,7 @@ We need you request permission about call before make call:
     await joinCall();
     ```
 
-    Note: When calling `joinCall`, sdk will check permission of microphone and camera. If have any permission denied, sdk will send a event `onRequestPermission` with list permission you need to request. You need to request permission before calling `joinCall` again.
+    Note: When calling `joinCall`, sdk will check permission of microphone and camera. If have any permission denied, sdk will send a event `onRequestPermissionAndroid` with list permission you need to request. You need to request permission before calling `joinCall` again.
 
   - End a call: We will push a event `endCall` for you.
 
@@ -882,7 +882,7 @@ useEffect(() => {
     omiEmitter.addListener(OmiCallEvent.onClickMissedCall, clickMissedCall);
     omiEmitter.addListener(OmiCallEvent.onSwitchboardAnswer, onSwitchboardAnswer);
     omiEmitter.addListener(OmiCallEvent.onCallQuality, onCallQuality);
-    omiEmitter.addListener(OmiCallEvent.onRequestPermission, onRequestPermission);
+    omiEmitter.addListener(OmiCallEvent.onRequestPermissionAndroid, onRequestPermission);
     if (Platform.OS === 'ios') {
       registerVideoEvent();
       omiEmitter.addListener(
@@ -896,7 +896,7 @@ useEffect(() => {
         omiEmitter.removeAllListeners(OmiCallEvent.onHold);
         omiEmitter.removeAllListeners(OmiCallEvent.onSpeaker);
         omiEmitter.removeAllListeners(OmiCallEvent.onSwitchboardAnswer);
-        omiEmitter.removeAllListeners(OmiCallEvent.onRequestPermission);
+        omiEmitter.removeAllListeners(OmiCallEvent.onRequestPermissionAndroid);
         if (Platform.OS === 'ios') {
            removeVideoEvent();
            omiEmitter.removeAllListeners(OmiCallEvent.onRemoteVideoReady);

package/android/build.gradle

@@ -1,27 +1,43 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["OmikitPlugin_kotlinVersion"]
-
-  repositories {
-    google()
-    mavenCentral()
-    // maven {
-    //   url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
-    //   credentials {
-    //     username = "downloader"
-    //     password = "Omi@2022"
-    //   }
-    // }
-  }
+// buildscript {
+//   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+//   def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["OmikitPlugin_kotlinVersion"]
+
+//   repositories {
+//     google()
+//     mavenCentral()
+//     // maven {
+//     //   url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
+//     //   credentials {
+//     //     username = "downloader"
+//     //     password = "Omi@2022"
+//     //   }
+//     // }
+//   }
+
+//   dependencies {
+//     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'
+//   }
+// }
 
-  dependencies {
-    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'
-  }
+buildscript {
+    ext {
+        kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["OmikitPlugin_kotlinVersion"]
+    }
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:8.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'
+    }
 }
 
 def isNewArchitectureEnabled() {
@@ -53,6 +69,11 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
+   buildFeatures {
+        buildConfig = true
+    }
+
+
   buildTypes {
     release {
       minifyEnabled false
@@ -68,33 +89,32 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
-  // kotlinOptions {
-  //     jvmTarget = '1.8'
-  // }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+       languageVersion = "1.6" // Minimum supported language version for compatibility
+        apiVersion = "1.6"
+        freeCompilerArgs += ["-Xskip-prerelease-check"]
+    }
+
 
   dataBinding {
     enabled = true
   }
 }
 
-allprojects {
-  repositories {
-    google()
-    mavenCentral()
-    jcenter() // Warning: this repository is going to shut down soon
-    maven {
-            url "https://maven.pkg.github.com/omicall/OMICall-SDK"
-            credentials {
-                username = project.findProperty("OMI_USER") ?: ""
-                password = project.findProperty("OMI_TOKEN") ?: ""
-            }
-            authentication {
-                basic(BasicAuthentication)
-            }
-        }
-  }
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
+}
+
+
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 

package/android/gradle.properties

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

package/android/settings.gradle

@@ -3,21 +3,31 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
+        maven { url "https://jitpack.io" }
+        maven {
+            url "https://maven.pkg.github.com/omicall/OMICall-SDK"
+             credentials {
+                username = System.getenv("OMI_USER") ?: ""
+                password = System.getenv("OMI_TOKEN") ?: ""
+            }
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
     }
 }
+
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) // Cho phép settings.gradle ưu tiên repositories
     repositories {
         google()
         mavenCentral()
-        maven {
-            url "https://jitpack.io"
-        }
+        maven { url "https://jitpack.io" }
         maven {
             url "https://maven.pkg.github.com/omicall/OMICall-SDK"
             credentials {
-                username = project.findProperty("OMI_USER") ?: ""
-                password = project.findProperty("OMI_TOKEN") ?: ""
+                 username = System.getenv("OMI_USER") ?: ""
+                password = System.getenv("OMI_TOKEN") ?: ""
             }
             authentication {
                 basic(BasicAuthentication)

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

@@ -162,7 +162,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onMuted(isMuted: Boolean) {
-     sendEvent(MUTED, isMuted)
+    sendEvent(MUTED, isMuted)
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
@@ -515,15 +515,17 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun endCall(promise: Promise) {
-    if (isIncomming && !isAnserCall) {
-      OmiClient.getInstance(reactApplicationContext!!).decline()
-    } else {
-      OmiClient.getInstance(reactApplicationContext!!).hangUp()
-    }
+    OmiClient.getInstance(reactApplicationContext!!).hangUp()
     promise.resolve(true)
 
   }
 
+  @ReactMethod
+  fun rejectCall(promise: Promise) {
+    OmiClient.getInstance(reactApplicationContext!!).decline()
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun toggleMute(promise: Promise) {
     mainScope.launch {
@@ -543,26 +545,26 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun toggleHold(promise: Promise) {
-      mainScope.launch {
-          try {
-              // Gọi hàm toggleHold() và kiểm tra kết quả
-              val result = withContext(Dispatchers.IO) {
-                  OmiClient.getInstance(reactApplicationContext!!).toggleHold()
-              }
+    mainScope.launch {
+      try {
+        // Gọi hàm toggleHold() và kiểm tra kết quả
+        val result = withContext(Dispatchers.IO) {
+          OmiClient.getInstance(reactApplicationContext!!).toggleHold()
+        }
 
-              // Kiểm tra nếu toggleHold trả về Unit
-              if (result == Unit) {
-                  promise.resolve(null) // Trả về null nếu kết quả là Unit
-              } else {
-                  promise.resolve(result)
-              }
-          } catch (e: Exception) {
-              promise.reject("TOGGLE_HOLD_EXCEPTION", "Exception occurred: ${e.message}", e)
-          }
+        // Kiểm tra nếu toggleHold trả về Unit
+        if (result == Unit) {
+          promise.resolve(null) // Trả về null nếu kết quả là Unit
+        } else {
+          promise.resolve(result)
+        }
+      } catch (e: Exception) {
+        promise.reject("TOGGLE_HOLD_EXCEPTION", "Exception occurred: ${e.message}", e)
       }
     }
   }
 
+
   @ReactMethod
   fun toggleSpeaker(promise: Promise) {
     currentActivity?.runOnUiThread {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omikit-plugin",
-  "version": "3.2.53",
+  "version": "3.2.54",
   "description": "Omikit Plugin by ViHAT",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -56,14 +56,14 @@
   "devDependencies": {
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^28.1.2",
-    "@types/react": "~17.0.21",
-    "@types/react-native": "0.70.0",
+    "@types/react": "18.3.1",
+    "@types/react-native": "0.76.2",
+    "react": "18.3.1",
+    "react-native": "0.76.2",
     "del-cli": "^5.0.0",
     "jest": "^28.1.1",
     "pod-install": "^0.1.0",
     "prettier": "^2.8.4",
-    "react": "^18.0.0",
-    "react-native": "^0.71.3",
     "react-native-builder-bob": "0.20.0",
     "release-it": "^15.0.0",
     "typescript": "^4.5.2"