Merge branch 'main' into fix/dup-crumbs-android

Author: marandaneto

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixes
 
 * Breadcrumbs should not be duplicated if there is no mechanism on Android ([#936](https://github.com/getsentry/sentry-dart/pull/936))
+* Maps with Key Object, Object would fail during serialization if not String, Object ([#935](https://github.com/getsentry/sentry-dart/pull/935))
 
 ## 6.6.3
 

dart/lib/src/protocol/breadcrumb.dart

@@ -129,11 +129,17 @@ class Breadcrumb {
   factory Breadcrumb.fromJson(Map<String, dynamic> json) {
     final levelName = json['level'];
     final timestamp = json['timestamp'];
+
+    var data = json['data'];
+    if (data != null) {
+      data = Map<String, dynamic>.from(data as Map);
+    }
+
     return Breadcrumb(
       timestamp: timestamp != null ? DateTime.tryParse(timestamp) : null,
       message: json['message'],
       category: json['category'],
-      data: json['data'],
+      data: data,
       level: levelName != null ? SentryLevel.fromName(levelName) : null,
       type: json['type'],
     );

dart/lib/src/protocol/mechanism.dart

@@ -76,13 +76,23 @@ class Mechanism {
 
   /// Deserializes a [Mechanism] from JSON [Map].
   factory Mechanism.fromJson(Map<String, dynamic> json) {
+    var data = json['data'];
+    if (data != null) {
+      data = Map<String, dynamic>.from(data as Map);
+    }
+
+    var meta = json['meta'];
+    if (meta != null) {
+      meta = Map<String, dynamic>.from(meta as Map);
+    }
+
     return Mechanism(
       type: json['type'],
       description: json['description'],
       helpLink: json['help_link'],
       handled: json['handled'],
-      meta: json['meta'],
-      data: json['data'],
+      meta: meta,
+      data: data,
       synthetic: json['synthetic'],
     );
   }

dart/lib/src/protocol/sentry_event.dart

@@ -275,13 +275,18 @@ class SentryEvent with SentryEventLike<SentryEvent> {
     final requestJson = json['request'] as Map<String, dynamic>?;
     final debugMetaJson = json['debug_meta'] as Map<String, dynamic>?;
 
+    var extra = json['extra'];
+    if (extra != null) {
+      extra = Map<String, dynamic>.from(extra as Map);
+    }
+
     return SentryEvent(
       eventId: SentryId.fromId(json['event_id']),
       timestamp:
           timestampJson != null ? DateTime.tryParse(timestampJson) : null,
       modules: modules,
       tags: tags,
-      extra: json['extra'],
+      extra: extra,
       fingerprint:
           fingerprintJson?.map((e) => e as String).toList(growable: false),
       breadcrumbs: breadcrumbs,