* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
256 lines
7.1 KiB
Dart
256 lines
7.1 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:device_info_plus/device_info_plus.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
import 'package:path/path.dart' as path_lib;
|
|
import 'package:path_provider/path_provider.dart';
|
|
import 'package:record/record.dart';
|
|
import 'package:wakelock_plus/wakelock_plus.dart';
|
|
|
|
import 'package:fluffychat/config/setting_keys.dart';
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/utils/localized_exception_extension.dart';
|
|
import 'package:fluffychat/utils/platform_infos.dart';
|
|
import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
|
|
import 'events/audio_player.dart';
|
|
|
|
// #Pangea
|
|
class PermissionException implements Exception {}
|
|
|
|
class EmptyAudioException implements Exception {}
|
|
// Pangea#
|
|
|
|
class RecordingViewModel extends StatefulWidget {
|
|
final Widget Function(BuildContext, RecordingViewModelState) builder;
|
|
|
|
const RecordingViewModel({required this.builder, super.key});
|
|
|
|
@override
|
|
RecordingViewModelState createState() => RecordingViewModelState();
|
|
}
|
|
|
|
class RecordingViewModelState extends State<RecordingViewModel> {
|
|
Timer? _recorderSubscription;
|
|
Duration duration = Duration.zero;
|
|
|
|
bool isSending = false;
|
|
|
|
bool get isRecording => _audioRecorder != null;
|
|
|
|
AudioRecorder? _audioRecorder;
|
|
final List<double> amplitudeTimeline = [];
|
|
|
|
String? fileName;
|
|
|
|
bool isPaused = false;
|
|
|
|
Future<void> startRecording(Room room) async {
|
|
room.client.getConfig(); // Preload server file configuration.
|
|
if (PlatformInfos.isAndroid) {
|
|
final info = await DeviceInfoPlugin().androidInfo;
|
|
if (info.version.sdkInt < 19) {
|
|
showOkAlertDialog(
|
|
context: context,
|
|
title: L10n.of(context).unsupportedAndroidVersion,
|
|
message: L10n.of(context).unsupportedAndroidVersionLong,
|
|
okLabel: L10n.of(context).close,
|
|
);
|
|
return;
|
|
}
|
|
}
|
|
if (await AudioRecorder().hasPermission() == false) return;
|
|
|
|
final audioRecorder = _audioRecorder ??= AudioRecorder();
|
|
setState(() {});
|
|
|
|
try {
|
|
// #Pangea
|
|
// final codec = kIsWeb
|
|
// // Web seems to create webm instead of ogg when using opus encoder
|
|
// // which does not play on iOS right now. So we use wav for now:
|
|
// ? AudioEncoder.wav
|
|
// // Everywhere else we use opus if supported by the platform:
|
|
// : !PlatformInfos
|
|
// .isIOS && // Blocked by https://github.com/llfbandit/record/issues/560
|
|
// await audioRecorder.isEncoderSupported(AudioEncoder.opus)
|
|
// ? AudioEncoder.opus
|
|
// : AudioEncoder.aacLc;
|
|
const codec = AudioEncoder.wav;
|
|
// Pangea#
|
|
fileName =
|
|
'recording${DateTime.now().microsecondsSinceEpoch}.${codec.fileExtension}';
|
|
String? path;
|
|
if (!kIsWeb) {
|
|
final tempDir = await getTemporaryDirectory();
|
|
path = path_lib.join(tempDir.path, fileName);
|
|
}
|
|
|
|
final result = await audioRecorder.hasPermission();
|
|
if (result != true) {
|
|
showOkAlertDialog(
|
|
context: context,
|
|
title: L10n.of(context).oopsSomethingWentWrong,
|
|
message: L10n.of(context).noPermission,
|
|
);
|
|
return;
|
|
}
|
|
await WakelockPlus.enable();
|
|
|
|
await audioRecorder.start(
|
|
RecordConfig(
|
|
bitRate: AppSettings.audioRecordingBitRate.value,
|
|
sampleRate: AppSettings.audioRecordingSamplingRate.value,
|
|
numChannels: AppSettings.audioRecordingNumChannels.value,
|
|
autoGain: AppSettings.audioRecordingAutoGain.value,
|
|
echoCancel: AppSettings.audioRecordingEchoCancel.value,
|
|
noiseSuppress: AppSettings.audioRecordingNoiseSuppress.value,
|
|
encoder: codec,
|
|
),
|
|
path: path ?? '',
|
|
);
|
|
setState(() => duration = Duration.zero);
|
|
_subscribe();
|
|
} catch (e, s) {
|
|
Logs().w('Unable to start voice message recording', e, s);
|
|
showOkAlertDialog(
|
|
context: context,
|
|
title: L10n.of(context).oopsSomethingWentWrong,
|
|
message: e.toString(),
|
|
);
|
|
setState(_reset);
|
|
}
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
_reset();
|
|
super.dispose();
|
|
}
|
|
|
|
void _subscribe() {
|
|
_recorderSubscription?.cancel();
|
|
_recorderSubscription = Timer.periodic(const Duration(milliseconds: 100), (
|
|
_,
|
|
) async {
|
|
final amplitude = await _audioRecorder!.getAmplitude();
|
|
var value = 100 + amplitude.current * 2;
|
|
value = value < 1 ? 1 : value;
|
|
amplitudeTimeline.add(value);
|
|
setState(() {
|
|
duration += const Duration(milliseconds: 100);
|
|
});
|
|
});
|
|
}
|
|
|
|
void _reset() {
|
|
WakelockPlus.disable();
|
|
_recorderSubscription?.cancel();
|
|
_audioRecorder?.stop();
|
|
_audioRecorder = null;
|
|
isSending = false;
|
|
fileName = null;
|
|
duration = Duration.zero;
|
|
amplitudeTimeline.clear();
|
|
isPaused = false;
|
|
}
|
|
|
|
void cancel() {
|
|
setState(() {
|
|
_reset();
|
|
});
|
|
}
|
|
|
|
void pause() {
|
|
_audioRecorder?.pause();
|
|
_recorderSubscription?.cancel();
|
|
setState(() {
|
|
isPaused = true;
|
|
});
|
|
}
|
|
|
|
void resume() {
|
|
_audioRecorder?.resume();
|
|
_subscribe();
|
|
setState(() {
|
|
isPaused = false;
|
|
});
|
|
}
|
|
|
|
void stopAndSend(
|
|
Future<void> Function(
|
|
String path,
|
|
int duration,
|
|
List<int> waveform,
|
|
String? fileName,
|
|
)
|
|
onSend,
|
|
) async {
|
|
_recorderSubscription?.cancel();
|
|
final path = await _audioRecorder?.stop();
|
|
|
|
if (path == null) throw ('Recording failed!');
|
|
const waveCount = AudioPlayerWidget.wavesCount;
|
|
final step = amplitudeTimeline.length < waveCount
|
|
? 1
|
|
: (amplitudeTimeline.length / waveCount).round();
|
|
final waveform = <int>[];
|
|
for (var i = 0; i < amplitudeTimeline.length; i += step) {
|
|
waveform.add((amplitudeTimeline[i] / 100 * 1024).round());
|
|
}
|
|
|
|
// #Pangea
|
|
if (amplitudeTimeline.isEmpty || amplitudeTimeline.every((e) => e <= 1)) {
|
|
if (mounted) {
|
|
showOkAlertDialog(
|
|
context: context,
|
|
title: L10n.of(context).oopsSomethingWentWrong,
|
|
message: EmptyAudioException().toLocalizedString(context),
|
|
);
|
|
}
|
|
return;
|
|
}
|
|
// Pangea#
|
|
|
|
setState(() {
|
|
isSending = true;
|
|
});
|
|
try {
|
|
await onSend(path, duration.inMilliseconds, waveform, fileName);
|
|
} catch (e, s) {
|
|
Logs().e('Unable to send voice message', e, s);
|
|
setState(() {
|
|
isSending = false;
|
|
});
|
|
return;
|
|
}
|
|
|
|
cancel();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) => widget.builder(context, this);
|
|
}
|
|
|
|
extension on AudioEncoder {
|
|
String get fileExtension {
|
|
switch (this) {
|
|
case AudioEncoder.aacLc:
|
|
case AudioEncoder.aacEld:
|
|
case AudioEncoder.aacHe:
|
|
return 'm4a';
|
|
case AudioEncoder.opus:
|
|
return 'ogg';
|
|
case AudioEncoder.wav:
|
|
return 'wav';
|
|
case AudioEncoder.amrNb:
|
|
case AudioEncoder.amrWb:
|
|
case AudioEncoder.flac:
|
|
case AudioEncoder.pcm16bits:
|
|
throw UnsupportedError('Not yet used');
|
|
}
|
|
}
|
|
}
|