Merge 1f72f2f into bdbe1f4

romtsn · web-flow · commit b323c6c3c2cf · 2025-10-07T14:13:52.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 - Use logger from options for JVM profiler ([#4771](https://github.com/getsentry/sentry-java/pull/4771))
+- Session Replay: Avoid deadlock when pausing replay if no connection ([#4788](https://github.com/getsentry/sentry-java/pull/4788))
 
 ### Miscellaneous
 
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt
@@ -307,15 +307,13 @@ public class ReplayIntegration(
     scopes?.configureScope { screen = it.screen?.substringAfterLast('.') }
     captureStrategy?.onScreenshotRecorded(bitmap) { frameTimeStamp ->
       addFrame(bitmap, frameTimeStamp, screen)
-      checkCanRecord()
     }
+    checkCanRecord()
   }
 
   override fun onScreenshotRecorded(screenshot: File, frameTimestamp: Long) {
-    captureStrategy?.onScreenshotRecorded { _ ->
-      addFrame(screenshot, frameTimestamp)
-      checkCanRecord()
-    }
+    captureStrategy?.onScreenshotRecorded { _ -> addFrame(screenshot, frameTimestamp) }
+    checkCanRecord()
   }
 
   override fun close() {

Original file line number	Diff line number	Diff line change
`@@ -307,15 +307,13 @@ public class ReplayIntegration(`
`307`	`307`	`scopes?.configureScope { screen = it.screen?.substringAfterLast('.') }`
`308`	`308`	`captureStrategy?.onScreenshotRecorded(bitmap) { frameTimeStamp ->`
`309`	`309`	`addFrame(bitmap, frameTimeStamp, screen)`
`310`		`- checkCanRecord()`
`311`	`310`	`}`
	`311`	`+ checkCanRecord()`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`override fun onScreenshotRecorded(screenshot: File, frameTimestamp: Long) {`
`315`		`- captureStrategy?.onScreenshotRecorded { _ ->`
`316`		`- addFrame(screenshot, frameTimestamp)`
`317`		`- checkCanRecord()`
`318`		`- }`
	`315`	`+ captureStrategy?.onScreenshotRecorded { _ -> addFrame(screenshot, frameTimestamp) }`
	`316`	`+ checkCanRecord()`
`319`	`317`	`}`
`320`	`318`
`321`	`319`	`override fun close() {`