diff --git a/lib/pangea/activity_planner/activity_plan_model.dart b/lib/pangea/activity_planner/activity_plan_model.dart index c71471ef1..93b74e01f 100644 --- a/lib/pangea/activity_planner/activity_plan_model.dart +++ b/lib/pangea/activity_planner/activity_plan_model.dart @@ -102,7 +102,7 @@ class ActivityPlanModel { ) : null, roles: roles, - bookmarkId: json[ModelKey.activityPlanBookmarkId], + bookmarkId: json[ModelKey.activityPlanBookmarkId] ?? json["bookmark_id"], ); } @@ -214,10 +214,16 @@ class ActivityRole { }); factory ActivityRole.fromJson(Map json) { + final urlContent = json['avatar_url'] as String?; + String? avatarUrl; + if (urlContent != null && urlContent.isNotEmpty) { + avatarUrl = urlContent; + } + return ActivityRole( id: json['id'], name: json['name'], - avatarUrl: json['avatar_url'], + avatarUrl: avatarUrl, ); }