Merge branch 'main' into feat/support-allow-urls-deny-urls

getsentry · Sep 4, 2024 · 10639ce · 10639ce
2 parents 99a6f98 + 3a16179
commit 10639ce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,10 @@
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8360)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.35.1...8.36.0)
 
+### Fixes
+
+- Only access renderObject if `hasSize` is true ([#2263](https://github.com/getsentry/sentry-dart/pull/2263))
+
 ## 8.8.0
 
 ### Features

diff --git a/dart/lib/src/transport/spotlight_http_transport.dart b/dart/lib/src/transport/spotlight_http_transport.dart
@@ -38,10 +38,6 @@ class SpotlightHttpTransport extends Transport {
   Future<void> _sendToSpotlight(SentryEnvelope envelope) async {
     envelope.header.sentAt = _options.clock();
 
-    // Screenshots do not work currently https://github.com/getsentry/spotlight/issues/274
-    envelope.items
-        .removeWhere((element) => element.header.contentType == 'image/png');
-
     final spotlightRequest = await _requestHandler.createRequest(envelope);
 
     final response = await _options.httpClient

diff --git a/flutter/ios/Classes/SentryFlutterPluginApple.swift b/flutter/ios/Classes/SentryFlutterPluginApple.swift
@@ -182,7 +182,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
         case "nativeCrash":
             crash()
 
-        case "sendReplayForEvent":
+        case "captureReplay":
 #if canImport(UIKit) && !SENTRY_NO_UIKIT && (os(iOS) || os(tvOS))
             PrivateSentrySDKOnly.captureReplay()
             result(PrivateSentrySDKOnly.getReplayId())

diff --git a/flutter/lib/src/view_hierarchy/sentry_tree_walker.dart b/flutter/lib/src/view_hierarchy/sentry_tree_walker.dart
@@ -255,7 +255,7 @@ class _TreeWalker {
     double? alpha;
 
     final renderObject = element.renderObject;
-    if (renderObject is RenderBox) {
+    if (renderObject is RenderBox && renderObject.hasSize) {
       final offset = renderObject.localToGlobal(Offset.zero);
       if (offset.dx > 0) {
         x = offset.dx;

diff --git a/flutter/test/event_processor/url_filter/web_url_filter_event_processor_test.dart b/flutter/test/event_processor/url_filter/web_url_filter_event_processor_test.dart
@@ -8,6 +8,7 @@ import 'package:sentry_flutter/src/event_processor/url_filter/url_filter_event_p
 // can be tested on command line with
 // `flutter test --platform=chrome test/event_processor/url_filter/web_url_filter_event_processor_test.dart`
 // The URL looks something like this: http://localhost:58551/event_processor/url_filter/web_url_filter_event_processor_test.html
+
 void main() {
   group(UrlFilterEventProcessor, () {
     late Fixture fixture;