ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: handle missing roles key in activity role model fromJson function

Browse source
This commit is contained in:
ggurdin 2025-11-03 11:44:39 -05:00
parent 7e6552faed
commit 7274442136
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pangea/activity_planner/activity_plan_model.dart
View file

@ -1,7 +1,8 @@
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;

6
lib/pangea/activity_sessions/activity_roles_model.dart
View file

@ -38,11 +38,11 @@ class ActivityRolesModel {
}
static ActivityRolesModel fromJson(Map<String, dynamic> json) {
final roles = (json['roles'] as Map<String, dynamic>)
.map((id, value) => MapEntry(id, ActivityRoleModel.fromJson(value)));
final roles = (json['roles'] as Map<String, dynamic>?)
?.map((id, value) => MapEntry(id, ActivityRoleModel.fromJson(value)));
return ActivityRolesModel(
roles,
roles ?? {},
);
}
}

7
lib/pangea/activity_sessions/activity_room_extension.dart
View file

@ -1,6 +1,10 @@
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';
@ -19,9 +23,6 @@ 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 {

2
pubspec.yaml
View file

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