Update

Author: buenaflor

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

@@ -443,16 +443,6 @@ class SentryFlutterPlugin :
       }
     }
 
-    @Suppress("unused") // Used by native/jni bindings
-    @JvmStatic
-    fun addBreadcrumbAsBytes(breadcrumbBytes: ByteArray) {
-      val logger = ScopesAdapter.getInstance().options.logger
-      val breadcrumbJson = breadcrumbBytes.toString(Charsets.UTF_8)
-      val reader = JsonObjectReader(StringReader(breadcrumbJson))
-      val breadcrumb = Breadcrumb.Deserializer().deserialize(reader, logger)
-      Sentry.addBreadcrumb(breadcrumb)
-    }
-
     private fun List<DebugImage>?.serialize() = this?.map { it.serialize() }
 
     private fun DebugImage.serialize() =

packages/flutter/ffi-jni.yaml

@@ -17,4 +17,6 @@ classes:
   - io.sentry.android.replay.ReplayIntegration
   - io.sentry.flutter.SentryFlutterPlugin
   - io.sentry.Sentry
+  - io.sentry.Breadcrumb
+  - io.sentry.ScopesAdapter
   - android.graphics.Bitmap

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

@@ -618,24 +618,6 @@ public class SentryFlutterPlugin: NSObject, FlutterPlugin {
             return nil
         }
   }
-
-  @objc public class func addBreadcrumbAsBytes(_ breadcrumbBytes: NSData) {
-      guard let breadcrumbDict = try? JSONSerialization.jsonObject(
-          with: breadcrumbBytes as Data,
-          options: []
-      ) as? [String: Any] else {
-          print("addBreadcrumb failed in native cocoa: could not parse bytes")
-          return
-      }
-      let breadcrumbInstance = PrivateSentrySDKOnly.breadcrumb(with: breadcrumbDict)
-      SentrySDK.addBreadcrumb(breadcrumbInstance)
-  }
-
-  @objc public class func clearBreadcrumbs() {
-      SentrySDK.configureScope { scope in
-          scope.clearBreadcrumbs()
-      }
-  }
 }
 // swiftlint:enable type_body_length
 

packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterPlugin.h

@@ -8,6 +8,5 @@
 + (nullable NSData *)fetchNativeAppStartAsBytes;
 + (nullable NSData *)loadContextsAsBytes;
 + (nullable NSData *)loadDebugImagesAsBytes:(NSSet<NSString *> *)instructionAddresses;
-+ (void)addBreadcrumbAsBytes:(NSData *)breadcrumbBytes;
 @end
 #endif

packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/ns_number.h

@@ -2,6 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// We need to add this file until we update the objective_c package due to a bug
+// See the issue: https://github.com/dart-lang/native/pull/2581
+
 #ifndef OBJECTIVE_C_SRC_NS_NUMBER_H_
 #define OBJECTIVE_C_SRC_NS_NUMBER_H_
 

packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/ns_number.m

@@ -2,6 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// We need to add this file until we update the objective_c package due to a bug
+// See the issue: https://github.com/dart-lang/native/pull/2581
+
 #import "ns_number.h"
 
 @implementation NSNumber (NSNumberIsFloat)

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

@@ -1447,8 +1447,6 @@ late final _sel_fetchNativeAppStartAsBytes =
 late final _sel_loadContextsAsBytes = objc.registerName("loadContextsAsBytes");
 late final _sel_loadDebugImagesAsBytes_ =
     objc.registerName("loadDebugImagesAsBytes:");
-late final _sel_addBreadcrumbAsBytes_ =
-    objc.registerName("addBreadcrumbAsBytes:");
 
 /// SentryFlutterPlugin
 class SentryFlutterPlugin extends objc.NSObject {
@@ -1507,12 +1505,6 @@ class SentryFlutterPlugin extends objc.NSObject {
         : objc.NSData.castFromPointer(_ret, retain: true, release: true);
   }
 
-  /// addBreadcrumbAsBytes:
-  static void addBreadcrumbAsBytes(objc.NSData breadcrumbBytes) {
-    _objc_msgSend_xtuoz7(_class_SentryFlutterPlugin, _sel_addBreadcrumbAsBytes_,
-        breadcrumbBytes.ref.pointer);
-  }
-
   /// init
   SentryFlutterPlugin init() {
     objc.checkOsVersionInternal('SentryFlutterPlugin.init',

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

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:typed_data';
 import 'package:meta/meta.dart';
 import 'package:objective_c/objective_c.dart';
@@ -8,7 +7,6 @@ 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';
@@ -192,46 +190,46 @@ class SentryNativeCocoa extends SentryNativeChannel {
       tryCatchSync('addBreadcrumb', () {
         final nativeBreadcrumb =
             cocoa.PrivateSentrySDKOnly.breadcrumbWithDictionary(
-                deepConvertMapNonNull(breadcrumb.toJson()).toNSDictionary());
+                _deepConvertMapNonNull(breadcrumb.toJson()).toNSDictionary());
         cocoa.SentrySDK.addBreadcrumb(nativeBreadcrumb);
       });
 
-  Map<Object, Object> deepConvertMapNonNull(Map<String, dynamic> input) {
-    final out = <Object, Object>{};
-
-    for (final entry in input.entries) {
-      final value = entry.value;
-      if (value == null) continue;
-
-      out[entry.key] = switch (value) {
-        Map<String, dynamic> m => deepConvertMapNonNull(m),
-        List<dynamic> l => [
-            for (final e in l)
-              if (e != null)
-                e is Map<String, dynamic>
-                    ? deepConvertMapNonNull(e)
-                    : e as Object
-          ],
-        _ => value as Object,
-      };
-    }
-
-    return out;
-  }
-
   @override
-  void clearBreadcrumbs() {
-    tryCatchSync('clearBreadcrumbs', () {
-      cocoa.SentrySDK.configureScope(
-          cocoa.ObjCBlock_ffiVoid_SentryScope.fromFunction(
-              (cocoa.SentryScope scope) {
-        scope.clearBreadcrumbs();
-      }));
-    });
-  }
+  void clearBreadcrumbs() => tryCatchSync('clearBreadcrumbs', () {
+        cocoa.SentrySDK.configureScope(
+            cocoa.ObjCBlock_ffiVoid_SentryScope.fromFunction(
+                (cocoa.SentryScope scope) {
+          scope.clearBreadcrumbs();
+        }));
+      });
 
   @override
   void resumeAppHangTracking() => tryCatchSync('resumeAppHangTracking', () {
         cocoa.SentrySDK.resumeAppHangTracking();
       });
 }
+
+/// This map conversion is needed so we can use the toNSDictionary extension function
+/// provided by the objective_c package.
+Map<Object, Object> _deepConvertMapNonNull(Map<String, dynamic> input) {
+  final out = <Object, Object>{};
+
+  for (final entry in input.entries) {
+    final value = entry.value;
+    if (value == null) continue;
+
+    out[entry.key] = switch (value) {
+      Map<String, dynamic> m => _deepConvertMapNonNull(m),
+      List<dynamic> l => [
+          for (final e in l)
+            if (e != null)
+              e is Map<String, dynamic>
+                  ? _deepConvertMapNonNull(e)
+                  : e as Object
+        ],
+      _ => value as Object,
+    };
+  }
+
+  return out;
+}