diff --git a/lib/pangea/activity_planner/activity_plan_model.dart b/lib/pangea/activity_planner/activity_plan_model.dart index b907daf0d..ef7287c42 100644 --- a/lib/pangea/activity_planner/activity_plan_model.dart +++ b/lib/pangea/activity_planner/activity_plan_model.dart @@ -1,8 +1,7 @@ -import 'package:flutter/foundation.dart'; - import 'package:fluffychat/pangea/activity_planner/activity_plan_request.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/constants/model_keys.dart'; +import 'package:flutter/foundation.dart'; class ActivityPlanModel { final String activityId; @@ -17,6 +16,7 @@ class ActivityPlanModel { final DateTime? endAt; final Duration? duration; final Map? _roles; + final bool isDeprecatedModel; ActivityPlanModel({ required this.req, @@ -32,6 +32,7 @@ class ActivityPlanModel { String? imageURL, this.endAt, this.duration, + this.isDeprecatedModel = false, }) : description = (description == null || description.isEmpty) ? learningObjective : description, @@ -96,6 +97,7 @@ class ActivityPlanModel { : null, roles: roles, activityId: activityId, + isDeprecatedModel: json["bookmark_id"] != null, ); } diff --git a/lib/pangea/activity_sessions/activity_room_extension.dart b/lib/pangea/activity_sessions/activity_room_extension.dart index 5af6879dd..1fe3591a1 100644 --- a/lib/pangea/activity_sessions/activity_room_extension.dart +++ b/lib/pangea/activity_sessions/activity_room_extension.dart @@ -1,10 +1,6 @@ import 'dart:math'; -import 'package:flutter/foundation.dart'; - import 'package:collection/collection.dart'; -import 'package:matrix/matrix.dart'; - import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart'; import 'package:fluffychat/pangea/activity_sessions/activity_role_model.dart'; import 'package:fluffychat/pangea/activity_sessions/activity_roles_model.dart'; @@ -23,6 +19,9 @@ import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/widgets/matrix.dart'; +import 'package:flutter/foundation.dart'; +import 'package:matrix/matrix.dart'; + import '../activity_summary/activity_summary_repo.dart'; class RoleException implements Exception { @@ -397,8 +396,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; diff --git a/pubspec.yaml b/pubspec.yaml index df1243788..c6e62d5b8 100644 --- a/pubspec.yaml +++ b/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+1 environment: sdk: ">=3.0.0 <4.0.0"