forked from eatvio/eatvio_app
merege from main + version bump
This commit is contained in:
@@ -10,6 +10,7 @@ import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_ses
|
||||
import 'package:eatvio_app/features/video_calls/services/video_call_fcm_handler.dart';
|
||||
import 'package:eatvio_app/features/video_calls/services/video_call_peer_departure.dart';
|
||||
import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
|
||||
import 'package:eatvio_app/features/video_calls/services/video_call_remote_end_registry.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_callkit_incoming/entities/call_event.dart';
|
||||
@@ -375,7 +376,7 @@ class VideoCallCallKitCoordinator {
|
||||
);
|
||||
return;
|
||||
}
|
||||
await _handleEnded(id);
|
||||
await _handleEnded(id, eventExtra: _callKitEventParams(event)?.extra);
|
||||
}
|
||||
|
||||
Future<void> _captureCallKitEventToSentry(CallEvent event) async {
|
||||
@@ -873,10 +874,24 @@ class VideoCallCallKitCoordinator {
|
||||
extra,
|
||||
handle: params?.handle ?? callKitId,
|
||||
);
|
||||
final endedPushDismissal = callKitDeclineIsEndedPush(
|
||||
cachedExtra: params?.extra,
|
||||
eventExtra: eventExtra,
|
||||
);
|
||||
final remoteEndDismissal =
|
||||
callKitDeclineIsEndedPush(
|
||||
cachedExtra: params?.extra,
|
||||
eventExtra: eventExtra,
|
||||
) ||
|
||||
VideoCallRemoteEndRegistry.contains(callKitId);
|
||||
|
||||
if (remoteEndDismissal) {
|
||||
// The call is already closed on the native side. Another endCall is
|
||||
// not needed: while the plugin's push flag is set it would end the
|
||||
// last reported call instead of this id, which may be a newer ring.
|
||||
log(
|
||||
'VideoCallCallKitCoordinator: remote end dismissal, callKitId=$callKitId',
|
||||
name: 'VideoCallCallKit',
|
||||
);
|
||||
_forgetCallKitId(callKitId);
|
||||
return;
|
||||
}
|
||||
|
||||
_suppressedEndCallKitIds.add(callKitId);
|
||||
try {
|
||||
@@ -888,12 +903,7 @@ class VideoCallCallKitCoordinator {
|
||||
}),
|
||||
);
|
||||
}
|
||||
_callKitParamsById.remove(callKitId);
|
||||
if (_activeCallKitId == callKitId) {
|
||||
_activeCallKitId = null;
|
||||
}
|
||||
|
||||
if (endedPushDismissal) return;
|
||||
_forgetCallKitId(callKitId);
|
||||
|
||||
if (_manager.isActiveCall ||
|
||||
_cubit.state.connectPhase != VideoCallConnectPhase.idle) {
|
||||
@@ -907,7 +917,10 @@ class VideoCallCallKitCoordinator {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _handleEnded(String callKitId) async {
|
||||
Future<void> _handleEnded(
|
||||
String callKitId, {
|
||||
Map<String, dynamic>? eventExtra,
|
||||
}) async {
|
||||
if (_suppressedEndCallKitIds.contains(callKitId)) {
|
||||
log(
|
||||
'VideoCallCallKitCoordinator: ignore spurious ended during accept, callKitId=$callKitId',
|
||||
@@ -916,16 +929,36 @@ class VideoCallCallKitCoordinator {
|
||||
return;
|
||||
}
|
||||
|
||||
_callKitParamsById.remove(callKitId);
|
||||
if (_activeCallKitId == callKitId) {
|
||||
_activeCallKitId = null;
|
||||
// iOS reports an ended VoIP push to CallKit and closes it right away.
|
||||
// That close is marked and must be remembered before the decline (or the
|
||||
// later timeout) event for the same id arrives with no marker.
|
||||
final remoteEnd = callKitDeclineIsEndedPush(
|
||||
cachedExtra: _paramsForCallId(callKitId)?.extra,
|
||||
eventExtra: eventExtra,
|
||||
);
|
||||
if (remoteEnd) {
|
||||
VideoCallRemoteEndRegistry.mark(callKitId);
|
||||
}
|
||||
|
||||
_forgetCallKitId(callKitId);
|
||||
|
||||
// Native already ends a remote-ended call. Calling endCall again here
|
||||
// overwrites the plugin's stored payload, so the decline that follows
|
||||
// would lose the marker.
|
||||
if (remoteEnd) return;
|
||||
|
||||
try {
|
||||
await FlutterCallkitIncoming.endCall(callKitId);
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
void _forgetCallKitId(String callKitId) {
|
||||
_callKitParamsById.remove(callKitId);
|
||||
if (_activeCallKitId == callKitId) {
|
||||
_activeCallKitId = null;
|
||||
}
|
||||
}
|
||||
|
||||
static String _parseConversationUuid(
|
||||
Map<String, Object?> extra, {
|
||||
String? handle,
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'dart:io';
|
||||
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
|
||||
import 'package:eatvio_app/features/video_calls/services/video_call_remote_end_registry.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_callkit_incoming/entities/call_kit_params.dart';
|
||||
import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
|
||||
@@ -53,16 +54,23 @@ abstract final class VideoCallEndedPushHandler {
|
||||
return false;
|
||||
}
|
||||
|
||||
/// The close of a ringing call comes back from the plugin as a decline.
|
||||
/// Each id is marked first, so the coordinator does not report that
|
||||
/// decline to the backend as if the user had rejected the call.
|
||||
static Future<void> _dismissViaCallKit(String? conversationUuid) async {
|
||||
final uuid = conversationUuid?.trim();
|
||||
try {
|
||||
final activeCalls = await FlutterCallkitIncoming.activeCalls();
|
||||
if (uuid == null || uuid.isEmpty) {
|
||||
for (final call in activeCalls) {
|
||||
VideoCallRemoteEndRegistry.mark(call.id);
|
||||
}
|
||||
await FlutterCallkitIncoming.endAllCalls();
|
||||
return;
|
||||
}
|
||||
for (final call in activeCalls) {
|
||||
if (!callMatchesConversation(call, uuid)) continue;
|
||||
VideoCallRemoteEndRegistry.mark(call.id);
|
||||
try {
|
||||
await FlutterCallkitIncoming.endCall(call.id);
|
||||
} catch (_) {}
|
||||
|
||||
@@ -20,6 +20,10 @@ typedef VideoCallAndroidIncomingShow =
|
||||
/// never arrived.
|
||||
abstract final class VideoCallIncomingPushPresenter {
|
||||
static const String _androidAccentColor = '#2787F5';
|
||||
|
||||
/// Same texts as the native VoIP path in `AppDelegate.swift`.
|
||||
static const String iosMissedCallSubtitle = 'Пропущенный видеозвонок';
|
||||
static const String iosMissedCallCallbackText = 'Перезвонить';
|
||||
static const MethodChannel _voipChannel = MethodChannel(
|
||||
'com.eatvioapp/voip_diagnostics',
|
||||
);
|
||||
@@ -97,6 +101,11 @@ abstract final class VideoCallIncomingPushPresenter {
|
||||
'counterpartIsConsultant': payload.counterpartIsConsultant,
|
||||
},
|
||||
callingNotification: const NotificationParams(showNotification: false),
|
||||
missedCallNotification: const NotificationParams(
|
||||
showNotification: true,
|
||||
subtitle: iosMissedCallSubtitle,
|
||||
callbackText: iosMissedCallCallbackText,
|
||||
),
|
||||
android: const AndroidParams(
|
||||
isCustomNotification: true,
|
||||
isShowLogo: false,
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
/// CallKit ids that were closed because the call ended remotely.
|
||||
///
|
||||
/// On iOS every close of a ringing call comes back from the plugin as a
|
||||
/// decline, whether the user tapped Decline or the app ended the call after a
|
||||
/// `video_call_ended` signal. Only a decline by the user may be reported to
|
||||
/// the backend; the other kind would make the server send one more ended
|
||||
/// push and the other phone would show it as a new incoming call.
|
||||
abstract final class VideoCallRemoteEndRegistry {
|
||||
/// Longer than the 45 s ring timeout: the plugin still emits a timeout
|
||||
/// event for a call it reported and closed right away.
|
||||
static const Duration ttl = Duration(minutes: 2);
|
||||
|
||||
static final Map<String, DateTime> _markedAt = <String, DateTime>{};
|
||||
|
||||
static void mark(String callKitId, {DateTime? now}) {
|
||||
final id = _normalize(callKitId);
|
||||
if (id.isEmpty) return;
|
||||
final at = now ?? DateTime.now();
|
||||
_prune(at);
|
||||
_markedAt[id] = at;
|
||||
}
|
||||
|
||||
static bool contains(String callKitId, {DateTime? now}) {
|
||||
final id = _normalize(callKitId);
|
||||
if (id.isEmpty) return false;
|
||||
_prune(now ?? DateTime.now());
|
||||
return _markedAt.containsKey(id);
|
||||
}
|
||||
|
||||
static void clear() => _markedAt.clear();
|
||||
|
||||
static String _normalize(String callKitId) => callKitId.trim().toLowerCase();
|
||||
|
||||
static void _prune(DateTime now) {
|
||||
_markedAt.removeWhere((_, markedAt) => now.difference(markedAt) >= ttl);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user