Update

Author: buenaflor

packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt

@@ -70,7 +70,6 @@ class SentryFlutterPlugin :
       "setContexts" -> setContexts(call.argument("key"), call.argument("value"), result)
       "removeContexts" -> removeContexts(call.argument("key"), result)
       "setUser" -> setUser(call.argument("user"), result)
-      "addBreadcrumb" -> addBreadcrumb(call.argument("breadcrumb"), result)
       "setExtra" -> setExtra(call.argument("key"), call.argument("value"), result)
       "removeExtra" -> removeExtra(call.argument("key"), result)
       "setTag" -> setTag(call.argument("key"), call.argument("value"), result)
@@ -194,18 +193,6 @@ class SentryFlutterPlugin :
     result.success("")
   }
 
-  private fun addBreadcrumb(
-    breadcrumb: Map<String, Any?>?,
-    result: Result,
-  ) {
-    if (breadcrumb != null) {
-      val options = ScopesAdapter.getInstance().options
-      val breadcrumbInstance = Breadcrumb.fromMap(breadcrumb, options)
-      Sentry.addBreadcrumb(breadcrumbInstance)
-    }
-    result.success("")
-  }
-
   private fun setExtra(
     key: String?,
     value: String?,

packages/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift

@@ -92,14 +92,6 @@ public class SentryFlutterPlugin: NSObject, FlutterPlugin {
             let user = arguments?["user"] as? [String: Any]
             setUser(user: user, result: result)
 
-        case "addBreadcrumb":
-            let arguments = call.arguments as? [String: Any?]
-            let breadcrumb = arguments?["breadcrumb"] as? [String: Any]
-            addBreadcrumb(breadcrumb: breadcrumb, result: result)
-
-        case "clearBreadcrumbs":
-            clearBreadcrumbs(result: result)
-
         case "setExtra":
             let arguments = call.arguments as? [String: Any?]
             let key = arguments?["key"] as? String
@@ -322,22 +314,6 @@ public class SentryFlutterPlugin: NSObject, FlutterPlugin {
       result("")
     }
 
-    private func addBreadcrumb(breadcrumb: [String: Any]?, result: @escaping FlutterResult) {
-      if let breadcrumb = breadcrumb {
-        let breadcrumbInstance = PrivateSentrySDKOnly.breadcrumb(with: breadcrumb)
-        SentrySDK.addBreadcrumb(breadcrumbInstance)
-      }
-      result("")
-    }
-
-    private func clearBreadcrumbs(result: @escaping FlutterResult) {
-      SentrySDK.configureScope { scope in
-        scope.clearBreadcrumbs()
-
-        result("")
-      }
-    }
-
     private func setExtra(key: String?, value: Any?, result: @escaping FlutterResult) {
       guard let key = key else {
         result("")

packages/flutter/lib/src/native/cocoa/sentry_native_cocoa.dart

@@ -8,6 +8,7 @@ import '../../../sentry_flutter.dart';
 import '../../replay/replay_config.dart';
 import '../native_app_start.dart';
 import '../sentry_native_channel.dart';
+import '../utils/data_normalizer.dart';
 import '../utils/utf8_json.dart';
 import 'binding.dart' as cocoa;
 import 'cocoa_replay_recorder.dart';
@@ -206,9 +207,7 @@ class SentryNativeCocoa extends SentryNativeChannel {
       final normalizedBreadcrumb = Breadcrumb(
         message: breadcrumb.message,
         category: breadcrumb.category,
-        data: breadcrumb.data != null
-            ? Map<String, dynamic>.from(breadcrumb.data!)
-            : null,
+        data: normalizeMap(breadcrumb.data),
         level: breadcrumb.level,
         type: breadcrumb.type,
         timestamp: breadcrumb.timestamp,

packages/flutter/lib/src/native/java/sentry_native_java.dart

@@ -9,6 +9,7 @@ import '../../../sentry_flutter.dart';
 import '../../replay/scheduled_recorder_config.dart';
 import '../native_app_start.dart';
 import '../sentry_native_channel.dart';
+import '../utils/data_normalizer.dart';
 import '../utils/utf8_json.dart';
 import 'android_envelope_sender.dart';
 import 'android_replay_recorder.dart';
@@ -230,9 +231,7 @@ class SentryNativeJava extends SentryNativeChannel {
       final normalizedBreadcrumb = Breadcrumb(
         message: breadcrumb.message,
         category: breadcrumb.category,
-        data: breadcrumb.data != null
-            ? Map<String, dynamic>.from(breadcrumb.data!)
-            : null,
+        data: normalizeMap(breadcrumb.data),
         level: breadcrumb.level,
         type: breadcrumb.type,
         timestamp: breadcrumb.timestamp,

packages/flutter/lib/src/native/method_channel_helper.dart

@@ -8,11 +8,11 @@ import 'package:meta/meta.dart';
 
 import '../../sentry_flutter.dart';
 import '../replay/replay_config.dart';
-import 'method_channel_helper.dart';
 import 'native_app_start.dart';
 import 'sentry_native_binding.dart';
 import 'sentry_native_invoker.dart';
 import 'sentry_safe_method_channel.dart';
+import 'utils/data_normalizer.dart';
 
 /// Provide typed methods to access native layer via MethodChannel.
 @internal
@@ -134,7 +134,7 @@ class SentryNativeChannel
         username: user.username,
         email: user.email,
         ipAddress: user.ipAddress,
-        data: MethodChannelHelper.normalizeMap(user.data),
+        data: normalizeMap(user.data),
         // ignore: deprecated_member_use
         extras: user.extras,
         geo: user.geo,
@@ -151,29 +151,19 @@ class SentryNativeChannel
 
   @override
   Future<void> addBreadcrumb(Breadcrumb breadcrumb) async {
-    final normalizedBreadcrumb = Breadcrumb(
-      message: breadcrumb.message,
-      category: breadcrumb.category,
-      data: MethodChannelHelper.normalizeMap(breadcrumb.data),
-      level: breadcrumb.level,
-      type: breadcrumb.type,
-      timestamp: breadcrumb.timestamp,
-      // ignore: invalid_use_of_internal_member
-      unknown: breadcrumb.unknown,
-    );
-    await channel.invokeMethod(
-      'addBreadcrumb',
-      {'breadcrumb': normalizedBreadcrumb.toJson()},
-    );
+    assert(false, "addBreadcrumb should not be used through method channels.");
   }
 
   @override
-  Future<void> clearBreadcrumbs() => channel.invokeMethod('clearBreadcrumbs');
+  Future<void> clearBreadcrumbs() async {
+    assert(
+        false, "clearBreadcrumbs should not be used through method channels.");
+  }
 
   @override
   Future<void> setContexts(String key, dynamic value) => channel.invokeMethod(
         'setContexts',
-        {'key': key, 'value': MethodChannelHelper.normalize(value)},
+        {'key': key, 'value': normalize(value)},
       );
 
   @override
@@ -183,7 +173,7 @@ class SentryNativeChannel
   @override
   Future<void> setExtra(String key, dynamic value) => channel.invokeMethod(
         'setExtra',
-        {'key': key, 'value': MethodChannelHelper.normalize(value)},
+        {'key': key, 'value': normalize(value)},
       );
 
   @override

packages/flutter/lib/src/native/sentry_native_channel.dart

@@ -0,0 +1,27 @@
+import 'package:meta/meta.dart';
+
+/// Normalizes data for serialization across native boundaries.
+/// Converts non-primitive types to strings for safe serialization.
+@internal
+dynamic normalize(dynamic data) {
+  if (data == null) return null;
+  if (_isPrimitive(data)) return data;
+  if (data is List<dynamic>) return _normalizeList(data);
+  if (data is Map<String, dynamic>) return normalizeMap(data);
+  return data.toString();
+}
+
+@internal
+Map<String, dynamic>? normalizeMap(Map<String, dynamic>? data) {
+  if (data == null) return null;
+  return data.map((key, value) => MapEntry(key, normalize(value)));
+}
+
+List<dynamic>? _normalizeList(List<dynamic>? data) {
+  if (data == null) return null;
+  return data.map((e) => normalize(e)).toList();
+}
+
+bool _isPrimitive(dynamic value) {
+  return value == null || value is String || value is num || value is bool;
+}

packages/flutter/lib/src/native/utils/data_normalizer.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:sentry_flutter/src/native/method_channel_helper.dart';
 import 'package:collection/collection.dart';
+import 'package:sentry_flutter/src/native/utils/data_normalizer.dart';
 
 void main() {
   group('normalize', () {
@@ -13,21 +13,21 @@ void main() {
         'string': 'Foo',
       };
 
-      var actual = MethodChannelHelper.normalizeMap(expected);
+      var actual = normalizeMap(expected);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
       );
 
-      expect(MethodChannelHelper.normalize(null), null);
-      expect(MethodChannelHelper.normalize(1), 1);
-      expect(MethodChannelHelper.normalize(1.1), 1.1);
-      expect(MethodChannelHelper.normalize(true), true);
-      expect(MethodChannelHelper.normalize('Foo'), 'Foo');
+      expect(normalize(null), null);
+      expect(normalize(1), 1);
+      expect(normalize(1.1), 1.1);
+      expect(normalize(true), true);
+      expect(normalize('Foo'), 'Foo');
     });
 
     test('object', () {
-      expect(MethodChannelHelper.normalize(_CustomObject()), 'CustomObject()');
+      expect(normalize(_CustomObject()), 'CustomObject()');
     });
 
     test('object in list', () {
@@ -38,7 +38,7 @@ void main() {
         'object': ['CustomObject()']
       };
 
-      var actual = MethodChannelHelper.normalize(input);
+      var actual = normalize(input);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -53,7 +53,7 @@ void main() {
         'object': <String, dynamic>{'object': 'CustomObject()'}
       };
 
-      var actual = MethodChannelHelper.normalize(input);
+      var actual = normalize(input);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -71,7 +71,7 @@ void main() {
         'string': 'Foo',
       };
 
-      var actual = MethodChannelHelper.normalizeMap(expected);
+      var actual = normalizeMap(expected);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -83,7 +83,7 @@ void main() {
         'list': [null, 1, 1.1, true, 'Foo'],
       };
 
-      var actual = MethodChannelHelper.normalizeMap(expected);
+      var actual = normalizeMap(expected);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -101,7 +101,7 @@ void main() {
         },
       };
 
-      var actual = MethodChannelHelper.normalizeMap(expected);
+      var actual = normalizeMap(expected);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -112,7 +112,7 @@ void main() {
       var input = <String, dynamic>{'object': _CustomObject()};
       var expected = <String, dynamic>{'object': 'CustomObject()'};
 
-      var actual = MethodChannelHelper.normalizeMap(input);
+      var actual = normalizeMap(input);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -127,7 +127,7 @@ void main() {
         'object': ['CustomObject()']
       };
 
-      var actual = MethodChannelHelper.normalizeMap(input);
+      var actual = normalizeMap(input);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,
@@ -142,7 +142,7 @@ void main() {
         'object': <String, dynamic>{'object': 'CustomObject()'}
       };
 
-      var actual = MethodChannelHelper.normalizeMap(input);
+      var actual = normalizeMap(input);
       expect(
         DeepCollectionEquality().equals(actual, expected),
         true,