omikit-plugin 3.3.20 → 3.3.22

package/README.md

@@ -235,7 +235,6 @@ public class MainActivity extends ReactActivity {
 
 ### ✅ For React Native > 0.74
 
-
 ```kotlin
 class MainActivity : ReactActivity() {
     // your config ....
@@ -243,6 +242,14 @@ class MainActivity : ReactActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        intent?.let { intentData ->
+            try {
+                OmikitPluginModule.Companion.handlePickupIntentEarly(this, intentData)
+            } catch (e: Exception) {
+                Log.e("MainActivity", "⚠️ PICKUP-FIX: Error handling early intent: ${e.message}")
+            }
+        }
+
         val reactInstanceManager: ReactInstanceManager = reactNativeHost.reactInstanceManager
         val currentContext = reactInstanceManager.currentReactContext
         if (currentContext != null && currentContext is ReactApplicationContext) {
@@ -263,21 +270,31 @@ class MainActivity : ReactActivity() {
     }
 
     override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        if (intent != null) {
-            reactApplicationContext?.let {
-                OmikitPluginModule.Companion.onGetIntentFromNotification(it, intent, this)
-            } ?: Log.e("MainActivity", "ReactApplicationContext has not been initialized in onNewIntent.")
-        } else {
-            Log.e("MainActivity", "Intent in onNewIntent is null.")
-        }
+       super.onNewIntent(intent)
+        intent?.let { newIntent ->
+            Log.d("MainActivity", "🚀 PICKUP-FIX: New intent received (warm start)")
+            // IMPORTANT: Update the activity's intent to the new one
+            setIntent(newIntent)
+            try {
+                // Try to handle immediately if React context is ready
+                reactApplicationContext?.let {
+                    OmikitPluginModule.Companion.onGetIntentFromNotification(it, newIntent, this)
+                } ?: run {
+                    OmikitPluginModule.Companion.handlePickupIntentEarly(this, newIntent)
+                }
+            } catch (e: Exception) {
+                Log.e("MainActivity", "❌ PICKUP-FIX: Error in onNewIntent: ${e.message}")
+            }
+        } ?: Log.e("MainActivity", "Intent in onNewIntent is null.")
     }
+
     override fun onResume() {
         super.onResume()
-        reactApplicationContext?.let {
+        reactApplicationContext?.let { context ->
             OmikitPluginModule.Companion.onResume(this)
-            intent?.let { intent ->
-                OmikitPluginModule.Companion.onGetIntentFromNotification(it, intent, this)
+            // Handle intent if exists (already updated by onNewIntent or from onCreate)
+            intent?.let { intentData ->
+                OmikitPluginModule.Companion.onGetIntentFromNotification(context, intentData, this)
             }
         } ?: Log.e("MainActivity", "ReactApplicationContext has not been initialized in onResume.")
     }

package/android/build.gradle

@@ -122,7 +122,7 @@ dependencies {
   implementation("androidx.work:work-runtime:2.8.1")
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
   // api 'vn.vihat.omicall:omi-sdk:2.3.23'
-  api "io.omicrm.vihat:omi-sdk:2.4.6"
+  api "io.omicrm.vihat:omi-sdk:2.4.15"
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -869,8 +869,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           } else {
               mainScope.launch {
                   Log.d("getInitialCall RN", "🔄 Retrying in 2s... (Attempts left: $counter)")
-                  delay(1000) // Chờ 2 giây
-                  getInitialCall(counter - 1, promise) // Gọi lại hàm đệ quy
+                  delay(1000) // Wait 2 seconds
+                  getInitialCall(counter - 1, promise) // Retry recursively
               }
           }
           return
@@ -883,6 +883,26 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       }
 
       val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+      val statusPendingCall = OmiKitUtils().getStatusPendingCall(context)
+
+      // 🔥 CRITICAL FIX: Auto-answer if user already clicked pickup button
+      // statusPendingCall: 0 = no action, 2 = incoming (opened notification), 5 = accepted (clicked pickup)
+      val shouldAutoAnswer = call.direction == "inbound" &&
+                             !call.isAccepted &&
+                             call.state == 3 &&
+                             statusPendingCall == 5 // 5 = User clicked pickup (CONFIRMED)
+
+      if (shouldAutoAnswer) {
+          Log.d("getInitialCall RN", "🚀 AUTO-ANSWER: User clicked pickup (statusPendingCall=$statusPendingCall), answering call immediately")
+          try {
+              OmiClient.getInstance(context).pickUp()
+              Log.d("getInitialCall RN", "✅ AUTO-ANSWER: Call answered successfully")
+
+              // Status already cleared by getStatusPendingCall()
+          } catch (e: Exception) {
+              Log.e("getInitialCall RN", "❌ AUTO-ANSWER: Failed to answer call: ${e.message}", e)
+          }
+      }
 
       val map: WritableMap = WritableNativeMap().apply {
           putString("callerNumber", phoneNumber)
@@ -892,9 +912,9 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
           putBoolean("muted", false)
           putBoolean("isVideo", call.isVideo ?: false)
           putString("typeNumber", typeNumber)
+          putBoolean("autoAnswered", shouldAutoAnswer) // Add flag for RN side
       }
 
-      val statusPendingCall = OmiKitUtils().getStatusPendingCall(context)
       if (call.state == 3 && statusPendingCall != 0) {
           call.state = statusPendingCall
       }
@@ -904,7 +924,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       if (statusPendingCall == 2 && call.state != 5) {
           Log.d("getInitialCall RN", "🚀 Incoming Receive Triggered ($statusPendingCall)")
 
-
           val eventMap: WritableMap = WritableNativeMap().apply {
               putBoolean("isVideo", call.isVideo ?: false)
               putBoolean("incoming", true)
@@ -1364,6 +1383,47 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       }
     }
 
+    /**
+     * 🔥 CRITICAL FIX: Handle pickup intent EARLY (before React Native ready)
+     * This method can be called from onCreate/onNewIntent when React context is not ready yet
+     * It will save the pickup state to SharedPreferences for later processing in getInitialCall()
+     */
+    fun handlePickupIntentEarly(act: Activity, intent: Intent) {
+      try {
+        val isIncoming = intent.getBooleanExtra(SipServiceConstants.ACTION_IS_INCOMING_CALL, false)
+        if (!isIncoming) {
+          Log.d("PICKUP-FIX", "Not an incoming call intent, skipping")
+          return
+        }
+
+        val isAcceptedCall = intent.getBooleanExtra(
+          SipServiceConstants.ACTION_ACCEPT_INCOMING_CALL, false
+        )
+
+        Log.d("PICKUP-FIX", "🚀 Early intent handler - isIncoming: $isIncoming, isAccepted: $isAcceptedCall")
+
+        // Save to SharedPreferences so getInitialCall() can detect it later
+        // setStatusPendingCall(true) → saves status=5 (CONFIRMED)
+        // setStatusPendingCall(false) → saves status=2 (INCOMING)
+        OmiKitUtils().setStatusPendingCall(act, isAcceptedCall)
+        Log.d("PICKUP-FIX", "✅ Saved pickup state to SharedPreferences (isAccepted=$isAcceptedCall)")
+
+        if (isAcceptedCall) {
+          // Try to answer immediately if possible (may fail if SDK not ready)
+          try {
+            OmiClient.getInstance(act, true)?.let { client ->
+              client.pickUp()
+              Log.d("PICKUP-FIX", "✅ Successfully answered call immediately")
+            } ?: Log.w("PICKUP-FIX", "⚠️ OmiClient not ready, will auto-answer in getInitialCall()")
+          } catch (e: Exception) {
+            Log.w("PICKUP-FIX", "⚠️ Cannot answer immediately (SDK not ready): ${e.message}. Will auto-answer in getInitialCall()")
+          }
+        }
+      } catch (e: Exception) {
+        Log.e("PICKUP-FIX", "❌ Error in handlePickupIntentEarly: ${e.message}", e)
+      }
+    }
+
     fun onGetIntentFromNotification(
       context: ReactApplicationContext,
       intent: Intent,

package/omikit-plugin.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   # Thêm dependency bắt buộc
   s.dependency "React-Core"
  
-  s.dependency "OmiKit", "1.8.45"
+  s.dependency "OmiKit", "1.8.47"
 
 
   s.requires_arc = true

package/package.json

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