ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1134 sound still playing when flagging an item (#1140)

Browse source 
* after redacting practice activity, wait for redaction event to come through before moving forward so the same event is not shown again

* don't play target token audio after flagging an activity
This commit is contained in:
ggurdin 2024-12-04 12:11:46 -05:00 • committed by GitHub
parent 09c88b6e28
commit c6efc97c96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
View file

@ -53,10 +53,16 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
@override
void didUpdateWidget(covariant MultipleChoiceActivity oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.practiceCardController.currentCompletionRecord?.responses
.isEmpty ??
false) {
speakTargetTokens();
if (currentRecordModel?.responses.isEmpty ?? false) {
// This gets triggered when the activity switches and when the activity is
// flagged. Only want to speak the target tokens when the activity switches.
final activityEventFuture =
widget.practiceCardController.currentActivityCompleter?.future;
activityEventFuture?.then((event) {
final redacted = event?.event.redacted ?? false;
if (mounted && !redacted) speakTargetTokens();
});
setState(() => selectedChoiceIndex = null);
}

20
lib/pangea/widgets/practice_activity/practice_activity_card.dart
View file

@ -23,6 +23,7 @@ import 'package:fluffychat/pangea/widgets/practice_activity/no_more_practice_car
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';
/// The wrapper for practice activity content.
/// Handles the activities associated with a message,
@ -135,6 +136,8 @@ class PracticeActivityCardState extends State<PracticeActivityCard> {
_updateFetchingActivity(false);
existingActivity.practiceActivity.targetTokens =
nextActivitySpecs.tokens;
currentActivityCompleter = Completer();
currentActivityCompleter!.complete(existingActivity);
return existingActivity.practiceActivity;
}
@ -268,6 +271,13 @@ class PracticeActivityCardState extends State<PracticeActivityCard> {
_setPracticeActivity(null);
}
bool _isActivityRedaction(EventUpdate update, String activityId) {
return update.content.containsKey('type') &&
update.content['type'] == 'm.room.redaction' &&
update.content.containsKey('content') &&
update.content['content']['redacts'] == activityId;
}
/// clear the current activity, record, and selection
/// fetch a new activity, including the offending activity in the request
Future<void> submitFeedback(String feedback) async {
@ -278,7 +288,15 @@ class PracticeActivityCardState extends State<PracticeActivityCard> {
if (currentActivityCompleter != null) {
final activityEvent = await currentActivityCompleter!.future;
await activityEvent?.event.redactEvent(reason: feedback);
if (activityEvent != null) {
await activityEvent.event.redactEvent(reason: feedback);
final eventID = activityEvent.event.eventId;
await activityEvent.event.room.client.onEvent.stream
.firstWhere(
(update) => _isActivityRedaction(update, eventID),
)
.timeout(const Duration(milliseconds: 2500));
}
} else {
debugger(when: kDebugMode);
ErrorHandler.logError(