Merge branch 'main' into choreographer-refactor

lib/pangea/activity_planner/activity_plan_model.dart

@@ -17,6 +17,7 @@ class ActivityPlanModel {
   final DateTime? endAt;
   final Duration? duration;
   final Map<String, ActivityRole>? _roles;
+  final bool isDeprecatedModel;
 
   ActivityPlanModel({
     required this.req,
@@ -32,6 +33,7 @@ class ActivityPlanModel {
     String? imageURL,
     this.endAt,
     this.duration,
+    this.isDeprecatedModel = false,
   })  : description = (description == null || description.isEmpty)
             ? learningObjective
             : description,
@@ -96,6 +98,7 @@ class ActivityPlanModel {
           : null,
       roles: roles,
       activityId: activityId,
+      isDeprecatedModel: json["bookmark_id"] != null,
     );
   }
 

lib/pangea/activity_sessions/activity_room_extension.dart

@@ -397,8 +397,9 @@ extension ActivityRoomExtension on Room {
   // helper functions for activity state for overall activity
 
   bool get isActivitySession =>
-      roomType?.startsWith(PangeaRoomTypes.activitySession) == true ||
-      activityPlan != null;
+      (roomType?.startsWith(PangeaRoomTypes.activitySession) == true ||
+          activityPlan != null) &&
+      activityPlan?.isDeprecatedModel == false;
 
   String? get activityId {
     if (!isActivitySession) return null;

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: 4.1.14+3
+version: 4.1.15+2
 
 environment:
   sdk: ">=3.0.0 <4.0.0"