Merge pull request #831 from pangeachat/freezing-fixes

Freezing fixes

lib/pangea/utils/logout.dart

@@ -20,8 +20,8 @@ void pLogoutAction(BuildContext context, {bool? isDestructiveAction}) async {
   final matrix = Matrix.of(context);
 
   // before wiping out locally cached construct data, save it to the server
-  await MatrixState.pangeaController.myAnalytics
-      .sendLocalAnalyticsToAnalyticsRoom();
+  // await MatrixState.pangeaController.myAnalytics
+  //     .sendLocalAnalyticsToAnalyticsRoom();
 
   await showFutureLoadingDialog(
     context: context,

lib/pangea/widgets/practice_activity/multiple_choice_activity.dart

@@ -2,13 +2,11 @@ import 'dart:developer';
 
 import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
-import 'package:fluffychat/pangea/controllers/my_analytics_controller.dart';
 import 'package:fluffychat/pangea/enum/activity_type_enum.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart';
 import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_card.dart';
 import 'package:fluffychat/pangea/widgets/practice_activity/word_audio_button.dart';
-import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -68,18 +66,18 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
     }
 
     // #freeze-activity
-    MatrixState.pangeaController.myAnalytics.setState(
-      AnalyticsStream(
-        // note - this maybe should be the activity event id
-        eventId:
-            widget.practiceCardController.widget.pangeaMessageEvent.eventId,
-        roomId: widget.practiceCardController.widget.pangeaMessageEvent.room.id,
-        constructs: currentRecordModel!.latestResponse!.toUses(
-          widget.practiceCardController.currentActivity!,
-          widget.practiceCardController.metadata,
-        ),
-      ),
-    );
+    // MatrixState.pangeaController.myAnalytics.setState(
+    //   AnalyticsStream(
+    //     // note - this maybe should be the activity event id
+    //     eventId:
+    //         widget.practiceCardController.widget.pangeaMessageEvent.eventId,
+    //     roomId: widget.practiceCardController.widget.pangeaMessageEvent.room.id,
+    //     constructs: currentRecordModel!.latestResponse!.toUses(
+    //       widget.practiceCardController.currentActivity!,
+    //       widget.practiceCardController.metadata,
+    //     ),
+    //   ),
+    // );
 
     // If the selected choice is correct, send the record and get the next activity
     if (widget.currentActivity.content.isCorrect(value, index)) {

pubspec.yaml

@@ -6,7 +6,7 @@ description: Learn a language while texting your friends.
 # Pangea#
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 1.21.7+3547
+version: 1.21.8+3548
 
 environment:
   sdk: ">=3.0.0 <4.0.0"