Merge pull request #2015 from famedly/krille/fix-push-notification-fr…

…omjson-tojson-fails fix: PushNotification fromJson - toJson fails
famedly · Feb 4, 2025 · ac77f0e · ac77f0e
2 parents 3353518 + eb9bd06
commit ac77f0e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/src/utils/push_notification.dart b/lib/src/utils/push_notification.dart
@@ -50,9 +50,11 @@ class PushNotification {
             ? (json['devices'] as List)
                 .map((d) => PushNotificationDevice.fromJson(d))
                 .toList()
-            : (jsonDecode(json['devices'] as String) as List)
-                .map((d) => PushNotificationDevice.fromJson(d))
-                .toList(),
+            : json['devices'] is String
+                ? (jsonDecode(json['devices'] as String) as List)
+                    .map((d) => PushNotificationDevice.fromJson(d))
+                    .toList()
+                : null,
         eventId: json['event_id'] as String?,
         prio: json['prio'] as String?,
         roomAlias: json['room_alias'] as String?,