forked from eatvio/eatvio_app
feat(video_calls): ios calle mic fix, infinite loading after accepting call on an oppened app fix, incaming call declining after declining on a different device
This commit is contained in:
@@ -1,16 +1,70 @@
|
||||
import 'dart:io';
|
||||
import 'dart:math';
|
||||
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
/// Stable id of this install, sent as `hw_id` on push registration and on
|
||||
/// video-call accept/decline.
|
||||
///
|
||||
/// Android `Build.ID` is the firmware id. Two phones on the same build share
|
||||
/// it, so the backend treats them as one device and a decline on one does not
|
||||
/// reach the other. A per-install id stays unique.
|
||||
abstract final class DeviceHwIdProvider {
|
||||
static Future<String?> current() async {
|
||||
final deviceInfo = DeviceInfoPlugin();
|
||||
static const androidInstallIdKey = 'eatvio.android_install_hw_id';
|
||||
static const androidTokenMigratedKey = 'eatvio.android_hw_id_token_migrated';
|
||||
|
||||
static Future<String?> current({SharedPreferences? preferences}) async {
|
||||
if (Platform.isIOS) {
|
||||
return (await deviceInfo.iosInfo).identifierForVendor;
|
||||
return (await DeviceInfoPlugin().iosInfo).identifierForVendor;
|
||||
}
|
||||
if (Platform.isAndroid) {
|
||||
return (await deviceInfo.androidInfo).id;
|
||||
return androidInstallId(preferences: preferences);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
static Future<String> androidInstallId({
|
||||
SharedPreferences? preferences,
|
||||
}) async {
|
||||
final prefs = preferences ?? await SharedPreferences.getInstance();
|
||||
final existing = prefs.getString(androidInstallIdKey)?.trim();
|
||||
if (existing != null && existing.length >= 8) return existing;
|
||||
|
||||
final created = _newInstallId();
|
||||
await prefs.setString(androidInstallIdKey, created);
|
||||
return created;
|
||||
}
|
||||
|
||||
/// The previous Android registration used `Build.ID`. Drop that token once
|
||||
/// and register again with the install id.
|
||||
static Future<bool> androidTokenNeedsReregister({
|
||||
SharedPreferences? preferences,
|
||||
}) async {
|
||||
if (!Platform.isAndroid) return false;
|
||||
final prefs = preferences ?? await SharedPreferences.getInstance();
|
||||
return prefs.getBool(androidTokenMigratedKey) != true;
|
||||
}
|
||||
|
||||
static Future<void> markAndroidTokenReregistered({
|
||||
SharedPreferences? preferences,
|
||||
}) async {
|
||||
final prefs = preferences ?? await SharedPreferences.getInstance();
|
||||
await prefs.setBool(androidTokenMigratedKey, true);
|
||||
}
|
||||
|
||||
static String _newInstallId() {
|
||||
final random = Random.secure();
|
||||
final bytes = List<int>.generate(16, (_) => random.nextInt(256));
|
||||
bytes[6] = (bytes[6] & 0x0f) | 0x40;
|
||||
bytes[8] = (bytes[8] & 0x3f) | 0x80;
|
||||
final hex = bytes
|
||||
.map((byte) => byte.toRadixString(16).padLeft(2, '0'))
|
||||
.join();
|
||||
return '${hex.substring(0, 8)}-'
|
||||
'${hex.substring(8, 12)}-'
|
||||
'${hex.substring(12, 16)}-'
|
||||
'${hex.substring(16, 20)}-'
|
||||
'${hex.substring(20)}';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'dart:developer';
|
||||
import 'dart:io';
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/app_initializer.dart';
|
||||
import 'package:eatvio_app/core/device/device_hw_id_provider.dart';
|
||||
import 'package:eatvio_app/core/notifications/notification_permission_requester.dart';
|
||||
import 'package:eatvio_app/core/push/hms_client_error.dart';
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
@@ -44,15 +45,16 @@ class FirebaseApi {
|
||||
Future<void> registerAnonymousPushToken() async {
|
||||
try {
|
||||
await _requestNotificationPermission();
|
||||
final deviceInfo = DeviceInfoPlugin();
|
||||
final credentials = await _resolvePushCredentials();
|
||||
final token = credentials.token;
|
||||
if (token == null || token.isEmpty) return;
|
||||
final hwId = await DeviceHwIdProvider.current();
|
||||
if (hwId == null || hwId.length < 8) return;
|
||||
await sl<Dio>().post(
|
||||
'/api/anonymous_token',
|
||||
data: {
|
||||
'platform': credentials.platform,
|
||||
'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
|
||||
'hw_id': hwId,
|
||||
'token': token,
|
||||
},
|
||||
).timeout(
|
||||
@@ -72,23 +74,38 @@ class FirebaseApi {
|
||||
if (!await TokenStorage.haveTokenInStorage()) return;
|
||||
try {
|
||||
await _requestNotificationPermission();
|
||||
final deviceInfo = DeviceInfoPlugin();
|
||||
final credentials = await _resolvePushCredentials();
|
||||
final token = credentials.token;
|
||||
if (token != null && token.isNotEmpty) {
|
||||
await sl<Dio>().post(
|
||||
'/api/profile/notification/token/register',
|
||||
data: {
|
||||
'platform': credentials.platform,
|
||||
'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
|
||||
'token': token,
|
||||
},
|
||||
).timeout(
|
||||
const Duration(seconds: 10),
|
||||
onTimeout: () {
|
||||
throw TimeoutException('registerPushToken timeout');
|
||||
},
|
||||
);
|
||||
final hwId = await DeviceHwIdProvider.current();
|
||||
final reregisterAndroid =
|
||||
await DeviceHwIdProvider.androidTokenNeedsReregister();
|
||||
if (token != null &&
|
||||
token.isNotEmpty &&
|
||||
hwId != null &&
|
||||
hwId.length >= 8) {
|
||||
if (reregisterAndroid) {
|
||||
try {
|
||||
await unregisterPushToken();
|
||||
} catch (_) {}
|
||||
}
|
||||
await sl<Dio>()
|
||||
.post(
|
||||
'/api/profile/notification/token/register',
|
||||
data: {
|
||||
'platform': credentials.platform,
|
||||
'hw_id': hwId,
|
||||
'token': token,
|
||||
},
|
||||
)
|
||||
.timeout(
|
||||
const Duration(seconds: 10),
|
||||
onTimeout: () {
|
||||
throw TimeoutException('registerPushToken timeout');
|
||||
},
|
||||
);
|
||||
if (reregisterAndroid) {
|
||||
await DeviceHwIdProvider.markAndroidTokenReregistered();
|
||||
}
|
||||
}
|
||||
} catch (e, st) {
|
||||
log(e.toString(), stackTrace: st);
|
||||
@@ -145,12 +162,13 @@ class FirebaseApi {
|
||||
final token = (await FlutterCallkitIncoming.getDevicePushTokenVoIP())?.trim();
|
||||
if (token == null || token.isEmpty) return;
|
||||
|
||||
final deviceInfo = DeviceInfoPlugin();
|
||||
final hwId = await DeviceHwIdProvider.current();
|
||||
if (hwId == null || hwId.length < 8) return;
|
||||
await sl<Dio>().post(
|
||||
'/api/profile/notification/token/voip/register',
|
||||
data: {
|
||||
'platform': 'ios',
|
||||
'hw_id': (await deviceInfo.iosInfo).identifierForVendor,
|
||||
'hw_id': hwId,
|
||||
'token': token,
|
||||
},
|
||||
).timeout(
|
||||
|
||||
@@ -50,6 +50,14 @@ class WsManager {
|
||||
|
||||
Stream<ChannelReadEvent>? get newMessagesStream => _privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
|
||||
|
||||
/// The callee rejected the ring. Broadcast to the caller and the callee.
|
||||
Stream<ChannelReadEvent>? get videoCallDeclinedStream =>
|
||||
_privateMessagesChannel?.bind('video-call-declined');
|
||||
|
||||
/// The call was cancelled or hung up. Same channel the web client uses.
|
||||
Stream<ChannelReadEvent>? get videoCallEndedStream =>
|
||||
_privateMessagesChannel?.bind('video-call-ended');
|
||||
|
||||
Stream<ChannelReadEvent>? get newNotificationsStream => _privateNotificationChannel?.bind('Illuminate\\Notifications\\Events\\BroadcastNotificationCreated');
|
||||
|
||||
Stream<ChannelReadEvent>? get directChatStream => _directChatStream;
|
||||
|
||||
Reference in New Issue
Block a user