diff --git a/lib/utils/voip/user_media_manager.dart b/lib/utils/voip/user_media_manager.dart index 03ecd6030..e1677f894 100644 --- a/lib/utils/voip/user_media_manager.dart +++ b/lib/utils/voip/user_media_manager.dart @@ -1,10 +1,5 @@ -import 'package:flutter/foundation.dart'; - -import 'package:flutter_ringtone_player/flutter_ringtone_player.dart'; import 'package:just_audio/just_audio.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; - class UserMediaManager { factory UserMediaManager() { return _instance; @@ -16,25 +11,16 @@ class UserMediaManager { AudioPlayer? _assetsAudioPlayer; - final FlutterRingtonePlayer _flutterRingtonePlayer = FlutterRingtonePlayer(); - Future startRingingTone() async { - if (PlatformInfos.isMobile) { - await _flutterRingtonePlayer.playRingtone(volume: 80); - } else if ((kIsWeb || PlatformInfos.isMacOS) && - _assetsAudioPlayer != null) { - const path = 'assets/sounds/phone.ogg'; - final player = _assetsAudioPlayer = AudioPlayer(); - player.setAsset(path); - player.play(); - } + const path = 'assets/sounds/phone.ogg'; + final player = _assetsAudioPlayer = AudioPlayer(); + player.setAsset(path); + player.play(); + return; } Future stopRingingTone() async { - if (PlatformInfos.isMobile) { - await _flutterRingtonePlayer.stop(); - } await _assetsAudioPlayer?.stop(); _assetsAudioPlayer = null; return; diff --git a/pubspec.lock b/pubspec.lock index 24894acbe..c4ee4256e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -629,14 +629,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.23" - flutter_ringtone_player: - dependency: "direct main" - description: - name: flutter_ringtone_player - sha256: d0277a04e629a6582d776f5dcc2a879a733f7326ba073b872a9ccfbff9d9b51f - url: "https://pub.dev" - source: hosted - version: "4.0.0+3" flutter_secure_storage: dependency: "direct main" description: @@ -731,10 +723,10 @@ packages: dependency: "direct main" description: name: flutter_webrtc - sha256: f6800cc2af79018c12e955ddf8ad007891fdfbb8199b0ce3dccd0977ed2add9c + sha256: "572df3de6c828e571db4b75b4a96a15c2f34fa3d420a84438f44a3158b22e81a" url: "https://pub.dev" source: hosted - version: "0.11.7" + version: "0.12.9" frontend_server_client: dependency: transitive description: @@ -2243,10 +2235,10 @@ packages: dependency: "direct main" description: name: webrtc_interface - sha256: abec3ab7956bd5ac539cf34a42fa0c82ea26675847c0966bb85160400eea9388 + sha256: "10fc6dc0ac16f909f5e434c18902415211d759313c87261f1e4ec5b4f6a04c26" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" win32: dependency: "direct overridden" description: diff --git a/pubspec.yaml b/pubspec.yaml index 57dd053d4..072f7e60b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -40,12 +40,11 @@ dependencies: flutter_new_badger: ^1.1.1 flutter_olm: 2.0.0 flutter_openssl_crypto: ^0.3.0 - flutter_ringtone_player: ^4.0.0+2 flutter_secure_storage: ^9.2.2 flutter_shortcuts_new: ^2.0.0 flutter_typeahead: ^5.2.0 flutter_web_auth_2: ^3.1.1 # Version 4 blocked by https://github.com/MixinNetwork/flutter-plugins/issues/379 - flutter_webrtc: ^0.11.7 + flutter_webrtc: ^0.12.9 geolocator: ^13.0.1 go_router: ^14.3.0 handy_window: ^0.4.0