From 1fc881fe1efaf03cbe711d51c3ae14abb3d2e3d0 Mon Sep 17 00:00:00 2001
From: wcjord <32568597+wcjord@users.noreply.github.com>
Date: Sat, 1 Nov 2025 17:46:25 -0400
Subject: [PATCH 1/4] hot-fix: ignore old activities

---
 lib/pangea/activity_planner/activity_plan_model.dart |  6 ++++--
 .../activity_sessions/activity_room_extension.dart   | 12 ++++++------
 pubspec.yaml                                         |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

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<String, ActivityRole>? _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..bfa787b13 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
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

From 2df74da2ea4d70c8b1cfa3756b9e88a9ea3d9340 Mon Sep 17 00:00:00 2001
From: wcjord <32568597+wcjord@users.noreply.github.com>
Date: Sat, 1 Nov 2025 17:50:58 -0400
Subject: [PATCH 2/4] chore: bump version again

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index bfa787b13..5c92dec76 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.15
+version: 4.1.16
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

From 0ef364bfbe28d944d36c66d419133103bfc7465f Mon Sep 17 00:00:00 2001
From: wcjord <32568597+wcjord@users.noreply.github.com>
Date: Sat, 1 Nov 2025 17:56:22 -0400
Subject: [PATCH 3/4] fix: version (#4581)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 5c92dec76..bfa787b13 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.16
+version: 4.1.15
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

From 7e6552faed937fa4322ba538b049cd699a81f27f Mon Sep 17 00:00:00 2001
From: wcjord <32568597+wcjord@users.noreply.github.com>
Date: Sat, 1 Nov 2025 18:04:55 -0400
Subject: [PATCH 4/4] fix: version number (#4582)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index bfa787b13..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.15
+version: 4.1.15+1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"