From 7a8664d328fc2be4a24b2bfb4f41d7df2a7a5f54 Mon Sep 17 00:00:00 2001 From: Joons van Stuijvenberg Date: Tue, 6 Dec 2022 12:00:43 +0100 Subject: [PATCH] fix null pointer profile data --- lib/src/widgets/profile/profile_wrapper.dart | 44 ++++++++++---------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/src/widgets/profile/profile_wrapper.dart b/lib/src/widgets/profile/profile_wrapper.dart index 02175a1..023884b 100644 --- a/lib/src/widgets/profile/profile_wrapper.dart +++ b/lib/src/widgets/profile/profile_wrapper.dart @@ -139,28 +139,30 @@ class _ProfileWrapperState extends State { } widgets.addAll(widget.extraWidgets ?? {}); widgets.addAll(defaultItems); - widgets.addAll(ItemList( - Map.fromEntries(widget.user.profileData!.toMap().entries), - widget.user.profileData!.mapWidget( - () { - widget.rebuild(); + if (widget.user.profileData != null) { + widgets.addAll(ItemList( + Map.fromEntries(widget.user.profileData!.toMap().entries), + widget.user.profileData!.mapWidget( + () { + widget.rebuild(); + }, + context, + ), + (key, value) { + if (widget.user.toMap()['profile_data'][key] == null) { + widget.service.editProfile(widget.user, key, value); + } else if (widget.user.toMap()['profile_data'][key] != value) { + widget.service.editProfile(widget.user, key, value); + } }, - context, - ), - (key, value) { - if (widget.user.toMap()['profile_data'][key] == null) { - widget.service.editProfile(widget.user, key, value); - } else if (widget.user.toMap()['profile_data'][key] != value) { - widget.service.editProfile(widget.user, key, value); - } - }, - () { - submitAllChangedFields(); - }, - itemBuilder: widget.itemBuilder, - itemBuilderOptions: widget.itemBuilderOptions, - formKey: _formKey, - ).getItemList()); + () { + submitAllChangedFields(); + }, + itemBuilder: widget.itemBuilder, + itemBuilderOptions: widget.itemBuilderOptions, + formKey: _formKey, + ).getItemList()); + } var items = Wrap( alignment: widget.wrapViewOptions?.wrapAlignment ?? WrapAlignment.start,