omikit-plugin 3.2.57 → 3.2.60

package/android/build.gradle

@@ -85,16 +85,13 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
 
     kotlinOptions {
-        jvmTarget = "1.8"
-       languageVersion = "1.6" // Minimum supported language version for compatibility
-        apiVersion = "1.6"
-        freeCompilerArgs += ["-Xskip-prerelease-check"]
+        jvmTarget = "17"
     }
 
 
@@ -106,7 +103,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 

package/android/gradle.properties

@@ -1,7 +1,7 @@
-OmikitPlugin_kotlinVersion=1.7.10
+OmikitPlugin_kotlinVersion=1.8.20
 OmikitPlugin_minSdkVersion=24
 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/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?) {
@@ -524,6 +524,12 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   }
 
+  @ReactMethod
+  fun rejectCall(promise: Promise) {
+    OmiClient.getInstance(reactApplicationContext!!).decline()
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun toggleMute(promise: Promise) {
     mainScope.launch {
@@ -543,26 +549,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/ios/Library/OmikitNotification.m

@@ -6,15 +6,10 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <OmikitPlugin/OmikitPlugin-Swift.h>
 
-#if __has_include("omikit_plugin-Swift.h")
-#import "omikit_plugin-Swift.h"
-#else
-#import <omikit_plugin/omikit_plugin-Swift.h>
-#endif
 
-
-@implementation OmikitNotification : NSObject
+@implementation OmikitNotification : NSObject 
 + (void)didRecieve:(NSDictionary*) userInfo{
     [[OmikitPlugin instance] didReceiveWithData:userInfo];
 }

package/ios/Library/OmikitPlugin.swift

@@ -285,6 +285,7 @@ public class OmikitPlugin: RCTEventEmitter {
   }
   
   
+  
   public override func supportedEvents() -> [String]! {
     return [
       CALL_STATE_CHANGED,

package/omikit-plugin.podspec

@@ -15,8 +15,7 @@ Pod::Spec.new do |s|
 
   # Chỉ định source files
   s.source_files = "ios/**/*.{h,m,mm,swift}"
-  s.public_header_files = "ios/**/*.h"
-  s.private_header_files = "ios/**/*+Private.h"
+
 
   # Đảm bảo hỗ trợ Swift
   s.swift_versions = ["5.0"]
@@ -24,8 +23,7 @@ Pod::Spec.new do |s|
   # Định nghĩa module để tránh lỗi Swift bridging header
   s.static_framework = true
   s.pod_target_xcconfig = {
-    "DEFINES_MODULE" => "YES",
-    "SWIFT_VERSION" => "5.0"
+    "DEFINES_MODULE" => "YES"
   }
 
   # Xác định module name
@@ -36,17 +34,21 @@ Pod::Spec.new do |s|
   s.dependency "OmiKit", "1.8.1"
 
   # Đảm bảo Swift bridging header được tự động tạo
-  s.requires_arc = true
+  # s.requires_arc = true
 
   # Xử lý riêng cho kiến trúc mới (New Architecture)
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
     s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
     s.xcconfig = {
       "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
       "OTHER_CPLUSPLUSFLAGS" => folly_compiler_flags,
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
     }
+    s.pod_target_xcconfig = {
+      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+      "OTHER_CPLUSPLUSFLAGS" => folly_compiler_flags,
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
     s.dependency "React-Codegen"
     s.dependency "RCT-Folly"
     s.dependency "RCTRequired"

package/package.json

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