From fd3f85199545196c1143bbfa89c5812e4caf2a9f Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:43:15 -0500 Subject: [PATCH] fix: fixes for sentry issues (#1500) --- .../analytics/extensions/client_analytics_extension.dart | 2 +- .../toolbar/repo/lemma_meaning_activity_generator.dart | 7 ++----- lib/pangea/toolbar/repo/practice_repo.dart | 2 +- lib/widgets/presence_builder.dart | 9 ++++++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/pangea/analytics/extensions/client_analytics_extension.dart b/lib/pangea/analytics/extensions/client_analytics_extension.dart index 5fee40fbf..4698ab33c 100644 --- a/lib/pangea/analytics/extensions/client_analytics_extension.dart +++ b/lib/pangea/analytics/extensions/client_analytics_extension.dart @@ -127,7 +127,7 @@ extension AnalyticsClientExtension on Client { final Random random = Random(); for (final space in spaces) { - if (userID == null) return; + if (userID == null || !space.canSendEvent(EventTypes.SpaceChild)) return; final List roomsNotAdded = _allMyAnalyticsRooms.where((room) { return !space.spaceChildren.any((child) => child.roomId == room.id); }).toList(); diff --git a/lib/pangea/toolbar/repo/lemma_meaning_activity_generator.dart b/lib/pangea/toolbar/repo/lemma_meaning_activity_generator.dart index 366c52013..d289c522c 100644 --- a/lib/pangea/toolbar/repo/lemma_meaning_activity_generator.dart +++ b/lib/pangea/toolbar/repo/lemma_meaning_activity_generator.dart @@ -1,5 +1,3 @@ -import 'package:flutter/material.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:fluffychat/pangea/analytics/enums/construct_type_enum.dart'; @@ -16,7 +14,6 @@ import 'package:fluffychat/widgets/matrix.dart'; class LemmaMeaningActivityGenerator { Future get( MessageActivityRequest req, - BuildContext context, ) async { final ConstructIdentifier lemmaId = ConstructIdentifier( lemma: req.targetTokens[0].lemma.text.isNotEmpty @@ -50,8 +47,8 @@ class LemmaMeaningActivityGenerator { langCode: req.userL2, activityType: ActivityTypeEnum.wordMeaning, content: ActivityContent( - question: - L10n.of(context).whatIsMeaning(lemmaId.lemma, lemmaId.category), + question: L10n.of(MatrixState.pangeaController.matrixState.context) + .whatIsMeaning(lemmaId.lemma, lemmaId.category), choices: choices, answers: [res.meaning], spanDisplayDetails: null, diff --git a/lib/pangea/toolbar/repo/practice_repo.dart b/lib/pangea/toolbar/repo/practice_repo.dart index cb748ba53..9820f8892 100644 --- a/lib/pangea/toolbar/repo/practice_repo.dart +++ b/lib/pangea/toolbar/repo/practice_repo.dart @@ -133,7 +133,7 @@ class PracticeGenerationController { case ActivityTypeEnum.morphId: return _morph.get(req); case ActivityTypeEnum.wordMeaning: - return _wordMeaning.get(req, context); + return _wordMeaning.get(req); case ActivityTypeEnum.wordFocusListening: case ActivityTypeEnum.hiddenWordListening: return _fetchFromServer( diff --git a/lib/widgets/presence_builder.dart b/lib/widgets/presence_builder.dart index 7aacc6f86..2f1a66d77 100644 --- a/lib/widgets/presence_builder.dart +++ b/lib/widgets/presence_builder.dart @@ -27,9 +27,12 @@ class _PresenceBuilderState extends State { StreamSubscription? _sub; void _updatePresence(CachedPresence? presence) { - setState(() { - _presence = presence; - }); + // #Pangea + // setState(() { + // _presence = presence; + // }); + if (mounted) setState(() => _presence = presence); + // Pangea# } @override