Still caputre replay for outbox events

Author: romtsn

sentry/src/main/java/io/sentry/SentryClient.java

@@ -3,6 +3,7 @@
 import io.sentry.clientreport.DiscardReason;
 import io.sentry.exception.SentryEnvelopeException;
 import io.sentry.hints.AbnormalExit;
+import io.sentry.hints.ApplyScopeData;
 import io.sentry.hints.Backfillable;
 import io.sentry.hints.Cached;
 import io.sentry.hints.DiskFlushNotification;
@@ -211,9 +212,11 @@ private boolean shouldApplyScopeData(final @NotNull CheckIn event, final @NotNul
     }
 
     final boolean isBackfillable = HintUtils.hasType(hint, Backfillable.class);
-    final boolean isCached = HintUtils.hasType(hint, Cached.class);
+    final boolean isCached =
+        HintUtils.hasType(hint, Cached.class) && !HintUtils.hasType(hint, ApplyScopeData.class);
     // if event is backfillable or cached we don't wanna trigger capture replay, because it's
-    // an event from the past
+    // an event from the past. If it's cached, but with ApplyScopeData, it comes from the outbox
+    // folder and we still want to capture replay (e.g. a native captureException error)
     if (event != null && !isBackfillable && !isCached && (event.isErrored() || event.isCrashed())) {
       options.getReplayController().captureReplay(event.isCrashed());
     }

sentry/src/test/java/io/sentry/SentryClientTest.kt

@@ -3014,6 +3014,29 @@ class SentryClientTest {
         assertFalse(called)
     }
 
+    @Test
+    fun `captures replay for cached events with apply scope`() {
+        var called = false
+        fixture.sentryOptions.setReplayController(object : ReplayController by NoOpReplayController.getInstance() {
+            override fun captureReplay(isTerminating: Boolean?) {
+                called = true
+            }
+        })
+        val sut = fixture.getSut()
+
+        sut.captureEvent(
+            SentryEvent().apply {
+                exceptions = listOf(
+                    SentryException().apply {
+                        mechanism = Mechanism().apply { isHandled = false }
+                    }
+                )
+            },
+            HintUtils.createWithTypeCheckHint(CachedWithApplyScopeHint())
+        )
+        assertTrue(called)
+    }
+
     @Test
     fun `when beforeSendReplay is set, callback is invoked`() {
         var invoked = false
@@ -3527,6 +3550,8 @@ class SentryClientTest {
     }
 
     private class CachedHint : Cached
+
+    private class CachedWithApplyScopeHint : Cached, ApplyScopeData
 }
 
 class DropEverythingEventProcessor : EventProcessor {