feat(video_calls): fixed naviagtion from push notification to call and added wake lock

2026-07-06 11:18:05 +03:00
parent 9ce7b035ff
commit 219908684f
10 changed files with 752 additions and 99 deletions
--- a/android/app/src/main/kotlin/com/eatvioapp/app/CallKitAcceptIntentMapper.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/CallKitAcceptIntentMapper.kt
@@ -0,0 +1,53 @@
+package com.eatvioapp.app
+
+import android.content.Intent
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
+
+object CallKitAcceptIntentMapper {
+    fun payloadFromBundle(data: Bundle, action: String): Map<String, Any?>? {
+        if (!action.contains(CallkitConstants.ACTION_CALL_ACCEPT) &&
+            !action.contains(CallkitConstants.ACTION_CALL_CALLBACK)
+        ) {
+            return null
+        }
+
+        return hashMapOf(
+            "action" to action,
+            "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
+            "handle" to data.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE, ""),
+            "nameCaller" to data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, ""),
+            "avatar" to data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, ""),
+            "extra" to data.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA),
+        )
+    }
+
+    fun payloadFromIntent(intent: Intent?): Map<String, Any?>? {
+        if (intent == null) return null
+
+        val data = intent.getBundleExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+            ?: return null
+        val action = intent.action ?: return null
+        if (!action.contains(CallkitConstants.ACTION_CALL_ACCEPT) &&
+            !action.contains(CallkitConstants.ACTION_CALL_CALLBACK)
+        ) {
+            return null
+        }
+
+        return hashMapOf(
+            "action" to action,
+            "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
+            "handle" to data.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE, ""),
+            "nameCaller" to data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, ""),
+            "avatar" to data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, ""),
+            "extra" to data.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA),
+        )
+    }
+
+    fun clearCallKitLaunchIntent(intent: Intent?) {
+        if (intent == null) return
+        intent.removeExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+        intent.action = null
+    }
+}
--- a/android/app/src/main/kotlin/com/eatvioapp/app/CallKitIntentBridge.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/CallKitIntentBridge.kt
@@ -8,16 +8,31 @@ import com.hiennv.flutter_callkit_incoming.CallkitIncomingBroadcastReceiver

 object CallKitIntentBridge {
    fun dispatchCallKitAction(context: Context, action: String, data: Bundle?) {
+        if (data != null) {
+            CallKitAcceptIntentMapper.payloadFromBundle(data, action)?.let { payload ->
+                PendingCallKitAcceptBridge.store(payload)
+            }
+        }
+
        val broadcastIntent = CallkitIncomingBroadcastReceiver.getIntent(context, action, data)
        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
        context.sendBroadcast(broadcastIntent)

-        if (MainActivity.isInForeground) {
+        val shouldLaunchMainActivity =
+            action == com.hiennv.flutter_callkit_incoming.CallkitConstants.ACTION_CALL_ACCEPT ||
+                action == com.hiennv.flutter_callkit_incoming.CallkitConstants.ACTION_CALL_CALLBACK ||
+                !MainActivity.isInForeground
+
+        if (!shouldLaunchMainActivity) {
            return
        }

        val activityIntent = AppUtils.getAppIntent(context, action, data) ?: return
-        activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        activityIntent.addFlags(
+            Intent.FLAG_ACTIVITY_NEW_TASK or
+                Intent.FLAG_ACTIVITY_SINGLE_TOP or
+                Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
+        )
        context.startActivity(activityIntent)
    }
 }
--- a/android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.os.Build
+import android.os.Bundle
 import android.util.Rational
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -34,6 +35,10 @@ class MainActivity: FlutterActivity() {
    override fun onResume() {
        super.onResume()
        isInForeground = true
+        captureCallKitLaunchIntent(intent)
+        if (PendingCallKitAcceptBridge.peek() != null) {
+            scheduleDeliverPendingCallKitAccept()
+        }
    }

    override fun onPause() {
@@ -57,6 +62,12 @@ class MainActivity: FlutterActivity() {
                        result.error("DISMISS_INCOMING_CALLS_FAILED", e.message, null)
                    }
                }
+                "drainPendingCallKitAccept" -> {
+                    result.success(PendingCallKitAcceptBridge.drain())
+                }
+                "peekPendingCallKitAccept" -> {
+                    result.success(PendingCallKitAcceptBridge.peekPending())
+                }
                else -> result.notImplemented()
            }
        }
@@ -124,6 +135,7 @@ class MainActivity: FlutterActivity() {

        // Обрабатываем возможный action_url, с которым была открыта Activity (например, из HMS уведомления).
        handleIntentForActionUrl(intent)
+        captureCallKitLaunchIntent(intent)
    }

    override fun onUserLeaveHint() {
@@ -134,10 +146,49 @@ class MainActivity: FlutterActivity() {

    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
+        setIntent(intent)
+        captureCallKitLaunchIntent(intent)
        // Обработка нового интента, когда Activity уже запущена (тап по уведомлению).
        handleIntentForActionUrl(intent)
    }

+    private fun captureCallKitLaunchIntent(intent: Intent?) {
+        val payload = CallKitAcceptIntentMapper.payloadFromIntent(intent) ?: return
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "captureCallKitLaunchIntent: action=${payload["action"]} id=${payload["id"]}",
+        )
+
+        PendingCallKitAcceptBridge.store(payload)
+        CallKitAcceptIntentMapper.clearCallKitLaunchIntent(intent)
+        scheduleDeliverPendingCallKitAccept()
+    }
+
+    private fun scheduleDeliverPendingCallKitAccept() {
+        PendingCallKitAcceptBridge.scheduleDeliverToFlutter(
+            deliver = { deliverPendingCallKitAcceptToFlutter() },
+        )
+    }
+
+    private fun deliverPendingCallKitAcceptToFlutter() {
+        val payload = PendingCallKitAcceptBridge.peek() ?: return
+        val channel = videoCallPushChannel
+        if (channel == null) {
+            android.util.Log.w(
+                "VideoCallPush",
+                "deliverPendingCallKitAcceptToFlutter: channel not ready",
+            )
+            return
+        }
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "deliverPendingCallKitAcceptToFlutter: id=${payload["id"]}",
+        )
+        channel.invokeMethod("onCallKitLaunchIntent", payload)
+    }
+
    private fun handleIntentForActionUrl(intent: Intent?) {
        if (intent == null) return

--- a/android/app/src/main/kotlin/com/eatvioapp/app/PendingCallKitAcceptBridge.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/PendingCallKitAcceptBridge.kt
@@ -0,0 +1,42 @@
+package com.eatvioapp.app
+
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+
+/// Stores accepted call payloads until the Flutter engine is ready to drain them.
+object PendingCallKitAcceptBridge {
+    private const val TAG = "PendingCallKitAccept"
+
+    @Volatile
+    private var pendingPayload: Map<String, Any?>? = null
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    fun store(payload: Map<String, Any?>) {
+        pendingPayload = payload
+        Log.i(TAG, "stored pending accept id=${payload["id"]}")
+    }
+
+    fun peek(): Map<String, Any?>? = pendingPayload
+
+    fun drain(): Map<String, Any?>? {
+        val payload = pendingPayload
+        pendingPayload = null
+        if (payload != null) {
+            Log.i(TAG, "drained pending accept id=${payload["id"]}")
+        }
+        return payload
+    }
+
+    fun peekPending(): Map<String, Any?>? = pendingPayload
+
+    fun scheduleDeliverToFlutter(
+        deliver: () -> Unit,
+        delaysMs: LongArray = longArrayOf(0L, 250L, 700L, 1500L, 2800L, 4200L, 6000L),
+    ) {
+        for (delayMs in delaysMs) {
+            mainHandler.postDelayed({ deliver() }, delayMs)
+        }
+    }
+}