Bug bot reviews

Author: buenaflor

packages/flutter/example/integration_test/replay_test.dart

@@ -168,8 +168,8 @@ void main() {
       expect(frameCount, equals(afterStopCount));
     }, skip: !Platform.isAndroid);
 
-    testWidgets('setReplayConfig applies without error on iOS', (tester) async {
-      if (!Platform.isAndroid) return;
+    testWidgets('setReplayConfig applies without error on Android',
+        (tester) async {
       await setupSentryAndApp(tester);
       const config = ReplayConfig(
         windowWidth: 1080,
@@ -188,7 +188,7 @@ void main() {
       await setupSentryAndApp(tester);
       final native = SentryFlutter.native as SentryNativeCocoa?;
       expect(native, isNotNull);
-      final json = await native!.testRecorder.captureScreenshot();
+      final json = await native!.testRecorder?.captureScreenshot();
       expect(json, isNotNull);
       expect(json!['length'], isNotNull);
       expect(json['address'], isNotNull);
@@ -198,7 +198,7 @@ void main() {
       expect((json['height'] as int) > 0, isTrue);
 
       // Capture again to ensure subsequent captures still succeed
-      final json2 = await native.testRecorder.captureScreenshot();
+      final json2 = await native.testRecorder?.captureScreenshot();
       expect(json2, isNotNull);
     }, skip: !Platform.isIOS);
   });

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

@@ -27,24 +27,8 @@ class SentryNativeCocoa extends SentryNativeChannel {
   @override
   SentryId? get replayId => _replayId;
 
-  // Test-only: expose recorder without MethodChannel.
   @visibleForTesting
-  CocoaReplayRecorder get testRecorder {
-    return _replayRecorder ??= CocoaReplayRecorder(options);
-  }
-
-  @visibleForTesting
-  Future<void> testSetReplayId(String? id,
-      {bool replayIsBuffering = false}) async {
-    final newId = id == null ? null : SentryId.fromId(id);
-    if (_replayId != newId) {
-      _replayId = newId;
-      await Sentry.configureScope((s) async {
-        // ignore: invalid_use_of_internal_member
-        s.replayId = !replayIsBuffering ? _replayId : null;
-      });
-    }
-  }
+  CocoaReplayRecorder? get testRecorder => _replayRecorder;
 
   @override
   Future<void> init(Hub hub) async {

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

@@ -367,14 +367,22 @@ class SentryNativeJava extends SentryNativeChannel {
             .privateSentryGetReplayIntegration();
         // The passed parameter is `isTerminating`
         _nativeReplay?.captureReplay(false.toJBoolean()..releasedBy(arena));
-        final jString = _nativeReplay?.getReplayId().toString$1()
-          ?..releasedBy(arena);
 
-        if (jString == null) {
-          return SentryId.empty();
-        } else {
-          return SentryId.fromId(jString.toDartString());
+        final nativeReplayId = _nativeReplay?.getReplayId();
+        nativeReplayId?.releasedBy(arena);
+
+        JString? jString;
+        if (nativeReplayId != null) {
+          jString = nativeReplayId.toString$1();
+          jString?.releasedBy(arena);
         }
+
+        final result = jString == null
+            ? SentryId.empty()
+            : SentryId.fromId(jString.toDartString());
+
+        _replayId = result;
+        return result;
       });
     });